diff --git a/content/xul/Makefile.in b/content/xul/Makefile.in
index 8d3a8093faba..4bd3b7565e52 100644
--- a/content/xul/Makefile.in
+++ b/content/xul/Makefile.in
@@ -44,11 +44,12 @@ include $(DEPTH)/config/autoconf.mk
 
 # We need to build document even if XUL is disabled, for the nsIController[s]
 # interfaces and implementations.
+# Likewise for content, because of nsXULAtoms.
 
-DIRS		= document
+DIRS		= document content
 
 ifdef MOZ_XUL
-DIRS		+= content templates
+DIRS		+= templates
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/content/xul/content/public/Makefile.in b/content/xul/content/public/Makefile.in
index b56a74ca068b..cc8d0ae0ce6f 100644
--- a/content/xul/content/public/Makefile.in
+++ b/content/xul/content/public/Makefile.in
@@ -44,10 +44,12 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xul
 
+ifdef MOZ_XUL
 EXPORTS		= \
                 nsIXULPopupListener.h \
 		nsIXULContent.h \
 		$(NULL)
+endif
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/content/xul/content/src/Makefile.in b/content/xul/content/src/Makefile.in
index b4f0ed277fab..b4bf6325dc39 100644
--- a/content/xul/content/src/Makefile.in
+++ b/content/xul/content/src/Makefile.in
@@ -74,9 +74,14 @@ EXPORTS		= \
 
 CPPSRCS		= \
 		nsXULAtoms.cpp \
+		$(NULL)
+
+ifdef MOZ_XUL
+CPPSRCS		+= \
 		nsXULElement.cpp \
 		nsXULPopupListener.cpp \
 		$(NULL)
+endif
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in
index f997eea6bcb2..e98451497a71 100644
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -120,6 +120,7 @@ SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/$(LIB_PREFIX)gkconxmlcon_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkconxmldoc_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkconxbl_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconxulcon_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkconxuldoc_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkview_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)jsdombase_s.$(LIB_SUFFIX) \
@@ -131,7 +132,6 @@ ifdef MOZ_XUL
 SHARED_LIBRARY_LIBS += \
 		$(DIST)/lib/$(LIB_PREFIX)gkxultree_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkxulgrid_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)gkconxulcon_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkconxultmpl_s.$(LIB_SUFFIX) \
 		$(NULL)
 endif