diff --git a/mozilla/accessible/src/base/Makefile.in b/mozilla/accessible/src/base/Makefile.in
index 441cac051ff..7ce4504533f 100644
--- a/mozilla/accessible/src/base/Makefile.in
+++ b/mozilla/accessible/src/base/Makefile.in
@@ -98,7 +98,7 @@ LOCAL_INCLUDES += \
   -I$(srcdir) \
   -I$(srcdir)/../html \
   -I$(srcdir)/../xul \
-  -I$(srcdir)/../../../layout/html/base/src \
+  -I$(srcdir)/../../../layout/generic \
   -I$(srcdir)/../../../layout/xul/base/src \
   $(NULL)
 
diff --git a/mozilla/accessible/src/html/Makefile.in b/mozilla/accessible/src/html/Makefile.in
index 660bc036ec6..5fc3ca56062 100644
--- a/mozilla/accessible/src/html/Makefile.in
+++ b/mozilla/accessible/src/html/Makefile.in
@@ -79,6 +79,6 @@ include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../base \
-  -I$(srcdir)/../../../layout/html/base/src \
+  -I$(srcdir)/../../../layout/generic \
   -I$(srcdir)/../../../layout/xul/base/src \
   $(NULL)
diff --git a/mozilla/allmakefiles.sh b/mozilla/allmakefiles.sh
index 5fb5870e3bf..096049a980f 100755
--- a/mozilla/allmakefiles.sh
+++ b/mozilla/allmakefiles.sh
@@ -287,9 +287,6 @@ content/html/content/src/Makefile
 content/html/document/Makefile
 content/html/document/public/Makefile
 content/html/document/src/Makefile
-content/html/style/Makefile
-content/html/style/public/Makefile
-content/html/style/src/Makefile
 content/xml/Makefile
 content/xml/content/Makefile
 content/xml/content/public/Makefile
@@ -312,32 +309,17 @@ content/xbl/src/Makefile
 content/xbl/builtin/Makefile
 content/xsl/Makefile
 content/xsl/public/Makefile
-content/shared/Makefile
-content/shared/public/Makefile
-content/shared/src/Makefile
 "
 
 MAKEFILES_layout="
 layout/Makefile
 layout/base/Makefile
-layout/base/public/Makefile
-layout/base/src/Makefile
 layout/base/tests/Makefile
 layout/build/Makefile
-layout/html/Makefile
-layout/html/base/Makefile
-layout/html/base/src/Makefile
-layout/html/document/Makefile
-layout/html/document/src/Makefile
-layout/html/forms/Makefile
-layout/html/forms/public/Makefile
-layout/html/forms/src/Makefile
-layout/html/style/Makefile
-layout/html/style/src/Makefile
-layout/html/table/Makefile
-layout/html/table/public/Makefile
-layout/html/table/src/Makefile
+layout/forms/Makefile
 layout/html/tests/Makefile
+layout/style/Makefile
+layout/printing/Makefile
 layout/tools/Makefile
 layout/xul/Makefile
 layout/xul/base/Makefile
@@ -823,11 +805,9 @@ dom/public/base/Makefile
 rdf/base/idl/Makefile
 xpfe/appshell/public/Makefile
 caps/idl/Makefile
-layout/html/forms/public/Makefile
 gfx/public/Makefile
 gfx/idl/Makefile
 widget/public/Makefile
-layout/base/public/Makefile
 docshell/base/Makefile
 modules/libpref/public/Makefile
 content/base/public/Makefile
diff --git a/mozilla/browser/installer/unix/packages-static b/mozilla/browser/installer/unix/packages-static
index e7848ef8b14..cb4bf59624c 100644
--- a/mozilla/browser/installer/unix/packages-static
+++ b/mozilla/browser/installer/unix/packages-static
@@ -103,6 +103,7 @@ bin/components/libjsd.so
 bin/components/jsdservice.xpt
 bin/components/jsurl.xpt
 bin/components/layout_base.xpt
+bin/components/layout_printing.xpt
 bin/components/layout_xul_tree.xpt
 bin/components/layout_xul.xpt
 bin/components/locale.xpt
diff --git a/mozilla/calendar/installer/windows/packages-static b/mozilla/calendar/installer/windows/packages-static
index 61005a5a740..f724adeaca0 100644
--- a/mozilla/calendar/installer/windows/packages-static
+++ b/mozilla/calendar/installer/windows/packages-static
@@ -109,6 +109,7 @@ bin\components\jsconsole-clhandler.js
 ;!4sunbird bin\components\jsdservice.xpt
 bin\components\jsurl.xpt
 bin\components\layout_base.xpt
+bin\components\layout_printing.xpt
 bin\components\layout_xul.xpt
 bin\components\layout_xul_tree.xpt
 bin\components\locale.xpt
diff --git a/mozilla/calendar/sunbird/Makefile.in b/mozilla/calendar/sunbird/Makefile.in
index 31ee04f5c5c..209abcf6577 100644
--- a/mozilla/calendar/sunbird/Makefile.in
+++ b/mozilla/calendar/sunbird/Makefile.in
@@ -222,6 +222,7 @@ endif
 	cp $(topsrcdir)/dist/bin/components/xultmpl.xpt ./$(MOZ_APP_NAME)/components
 	cp $(topsrcdir)/dist/bin/components/content_xslt.xpt ./$(MOZ_APP_NAME)/components
 	cp $(topsrcdir)/dist/bin/components/layout_base.xpt ./$(MOZ_APP_NAME)/components
+	cp $(topsrcdir)/dist/bin/components/layout_printing.xpt ./$(MOZ_APP_NAME)/components
 	cp $(topsrcdir)/dist/bin/components/layout_xul.xpt ./$(MOZ_APP_NAME)/components
 	cp $(topsrcdir)/dist/bin/components/layout_xul_tree.xpt ./$(MOZ_APP_NAME)/components
 	cp $(topsrcdir)/dist/bin/components/shistory.xpt ./$(MOZ_APP_NAME)/components
diff --git a/mozilla/camino/Camino.xcode/project.pbxproj b/mozilla/camino/Camino.xcode/project.pbxproj
index cd0ee37bb7d..7d540cd9f2f 100644
--- a/mozilla/camino/Camino.xcode/project.pbxproj
+++ b/mozilla/camino/Camino.xcode/project.pbxproj
@@ -190,6 +190,7 @@
 				F6BD63EF01B313EE01A962F7,
 				F6BD63F001B313EE01A962F7,
 				F6BD63F101B313EE01A962F7,
+				F6BD63F201B313EE01A962F7,
 				F6BD641D01B3156701A962F7,
 				F6BD641F01B3156701A962F7,
 				F6BD642001B3156701A962F7,
@@ -2860,6 +2861,7 @@
 				3F44AD2A05BDFB9F00CB4B08,
 				3F44AD2B05BDFB9F00CB4B08,
 				3F44AD2C05BDFB9F00CB4B08,
+				3F44ADB105BDFB9F00CB4B08,
 			);
 			isa = PBXCopyFilesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4373,6 +4375,12 @@
 			isa = PBXRezBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		3F44ADB105BDFB9F00CB4B08 = {
+			fileRef = F6BD63F201B313EE01A962F7;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		3F44ADB205BDFBA000CB4B08 = {
 			isa = PBXFileReference;
 			lastKnownFileType = text.xml;
@@ -6808,6 +6816,7 @@
 				3F44AF4505BDFBA000CB4B08,
 				3F44AF4605BDFBA000CB4B08,
 				3F44AF4705BDFBA000CB4B08,
+				3F44AFF905BDFBA000CB4B08,
 			);
 			isa = PBXCopyFilesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -8374,6 +8383,12 @@
 			settings = {
 			};
 		};
+		3F44AFF905BDFBA000CB4B08 = {
+			fileRef = F6BD63F201B313EE01A962F7;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		3F558E950552122E006156FD = {
 			isa = PBXFileReference;
 			lastKnownFileType = wrapper.framework;
@@ -14426,6 +14441,14 @@
 			refType = 2;
 			sourceTree = SOURCE_ROOT;
 		};
+		F6BD63F201B313EE01A962F7 = {
+			isa = PBXFileReference;
+			lastKnownFileType = file;
+			name = layout_printing.xpt;
+			path = ../dist/Embed/components/layout_printing.xpt;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
 		F6BD640E01B3156701A962F7 = {
 			isa = PBXFileReference;
 			lastKnownFileType = "compiled.mach-o.bundle";
diff --git a/mozilla/content/Makefile.in b/mozilla/content/Makefile.in
index 146226a56c4..00c0536b331 100644
--- a/mozilla/content/Makefile.in
+++ b/mozilla/content/Makefile.in
@@ -53,7 +53,7 @@ ifdef MOZ_XTF
 DIRS            += xtf
 endif
 
-DIRS           += events shared
+DIRS           += events
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/content/base/public/Makefile.in b/mozilla/content/base/public/Makefile.in
index 0ed2b6115b6..80082a7c7b6 100644
--- a/mozilla/content/base/public/Makefile.in
+++ b/mozilla/content/base/public/Makefile.in
@@ -46,6 +46,7 @@ XPIDL_MODULE	= content_base
 GRE_MODULE	= 1
 
 EXPORTS		= \
+mozFlushType.h \
 nsIContent.h \
 nsIAttribute.h \
 nsIContentIterator.h \
@@ -55,18 +56,13 @@ nsContentUtils.h \
 nsIDocument.h \
 nsIDocumentEncoder.h \
 nsIDocumentObserver.h \
-nsIDocumentViewer.h \
 nsINameSpace.h \
 nsINameSpaceManager.h \
 nsINodeInfo.h \
 nsIRangeUtils.h \
 nsIScriptElement.h \
 nsIStyledContent.h \
-nsIStyleRule.h \
-nsIStyleRuleSupplier.h \
-nsIStyleSheet.h \
 nsIStyleSheetLinkingElement.h \
-nsIStyleRuleProcessor.h \
 nsITextContent.h \
 nsIPrivateDOMImplementation.h \
 nsIContentSerializer.h \
@@ -75,7 +71,6 @@ nsIXPathEvaluatorInternal.h \
 mozISanitizingSerializer.h \
 nsIContentList.h \
 nsIFrameLoader.h \
-nsLayoutStylesheetCache.h \
 nsContentCID.h \
 nsCopySupport.h \
 nsContentCreatorFunctions.h \
@@ -95,9 +90,6 @@ XPIDLSRCS	= \
 		nsIScriptLoader.idl  \
 		nsIScriptLoaderObserver.idl  \
 		nsISyncLoadDOMService.idl  \
-		nsIPrintProgress.idl  \
-		nsIPrintProgressParams.idl  \
-		nsIPrintStatusFeedback.idl  \
 		nsIDragDropHandler.idl \
 		nsIScriptEventHandler.idl \
 		nsIScriptEventManager.idl \
diff --git a/mozilla/content/base/src/Makefile.in b/mozilla/content/base/src/Makefile.in
index 51658d5c975..a9290d319e8 100644
--- a/mozilla/content/base/src/Makefile.in
+++ b/mozilla/content/base/src/Makefile.in
@@ -78,64 +78,60 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 EXPORTS		= \
-		nsStubDocumentObserver.h \
+		nsAtomListUtils.h \
+		nsHTMLValue.h \
 		nsNodeInfoManager.h \
-		nsStyleSet.h \
+		nsPropertyTable.h \
+		nsStubDocumentObserver.h \
+		nsTextFragment.h \
 		$(NULL)
 
 CPPSRCS		= \
+		mozSanitizingSerializer.cpp \
+		nsAtomListUtils.cpp \
 		nsAttrAndChildArray.cpp \
 		nsAttrValue.cpp \
-		nsContentSink.cpp \
-		nsPrintEngine.cpp \
-		nsPrintData.cpp \
-		nsPrintObject.cpp \
-		nsPagePrintTimer.cpp \
-		nsPrintPreviewListener.cpp \
 		nsCommentNode.cpp \
+		nsContentAreaDragDrop.cpp \
 		nsContentIterator.cpp \
 		nsContentList.cpp \
 		nsContentPolicy.cpp \
-		nsDocument.cpp \
-		nsDocumentEncoder.cpp \
-		nsDocumentFragment.cpp \
-		nsDocumentViewer.cpp \
+		nsContentSink.cpp \
+		nsContentUtils.cpp \
+		nsCopySupport.cpp \
 		nsDOMAttribute.cpp \
 		nsDOMAttributeMap.cpp \
 		nsDOMDocumentType.cpp \
 		nsDOMLists.cpp \
+		nsDocument.cpp \
+		nsDocumentEncoder.cpp \
+		nsDocumentFragment.cpp \
+		nsFrameLoader.cpp \
 		nsGenConImageContent.cpp \
 		nsGeneratedIterator.cpp \
 		nsGenericDOMDataNode.cpp \
 		nsGenericDOMNodeList.cpp \
 		nsGenericElement.cpp \
-		nsContentUtils.cpp \
-		nsLayoutStylesheetCache.cpp \
+		nsHTMLContentSerializer.cpp \
+		nsHTMLValue.cpp \
+		nsImageLoadingContent.cpp \
 		nsMappedAttributes.cpp \
 		nsNameSpaceManager.cpp \
 		nsNodeInfo.cpp \
 		nsNodeInfoManager.cpp \
+		nsParserUtils.cpp \
+		nsPlainTextSerializer.cpp \
+		nsPropertyTable.cpp \
 		nsRange.cpp \
-		nsRuleNode.cpp \
-		nsSelection.cpp \
+		nsScriptEventManager.cpp \
+		nsScriptLoader.cpp \
 		nsStubDocumentObserver.cpp \
-		nsStyleContext.cpp \
-		nsStyleSet.cpp \
+		nsStyleLinkElement.cpp \
 		nsSyncLoadService.cpp \
+		nsTextFragment.cpp \
 		nsTextNode.cpp \
 		nsTreeWalker.cpp \
 		nsXMLContentSerializer.cpp \
-		nsHTMLContentSerializer.cpp \
-		nsParserUtils.cpp \
-		nsPlainTextSerializer.cpp \
-		mozSanitizingSerializer.cpp \
-		nsScriptLoader.cpp \
-		nsStyleLinkElement.cpp \
-		nsContentAreaDragDrop.cpp \
-		nsFrameLoader.cpp \
-		nsScriptEventManager.cpp \
-		nsImageLoadingContent.cpp \
-		nsCopySupport.cpp \
 		$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a
@@ -146,16 +142,14 @@ include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(srcdir)/../../events/src \
-		-I$(srcdir)/../../html/base/src \
-		-I$(srcdir)/../../html/style/src \
 		-I$(srcdir)/../../xml/content/src \
 		-I$(srcdir)/../../xul/base/src \
 		-I$(srcdir)/../../xul/content/src \
 		-I$(srcdir)/../../html/content/src \
 		-I$(srcdir)/../../base/src \
-		-I$(srcdir)/../../../layout/html/base/src \
+		-I$(srcdir)/../../../layout/generic \
+		-I$(srcdir)/../../../layout/style \
 		-I$(srcdir)/../../../dom/src/base \
-		-I$(srcdir)/../../../view/src \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/mozilla/content/html/Makefile.in b/mozilla/content/html/Makefile.in
index 84bbdd24fb4..3e24e6ec4ae 100644
--- a/mozilla/content/html/Makefile.in
+++ b/mozilla/content/html/Makefile.in
@@ -42,6 +42,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= content document style
+DIRS		= content document
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/content/html/content/public/Makefile.in b/mozilla/content/html/content/public/Makefile.in
index 21183bec68d..0a467d3e905 100644
--- a/mozilla/content/html/content/public/Makefile.in
+++ b/mozilla/content/html/content/public/Makefile.in
@@ -53,6 +53,8 @@ XPIDLSRCS	= \
 EXPORTS		= \
 		nsIFormControl.h \
 		nsIForm.h \
+		nsIFormProcessor.h \
+		nsIFormSubmitObserver.h \
 		nsIHTMLContent.h \
 		nsILink.h \
 		nsIOptionElement.h \
diff --git a/mozilla/content/html/content/src/Makefile.in b/mozilla/content/html/content/src/Makefile.in
index 77e8b124630..dbeb673e8d0 100644
--- a/mozilla/content/html/content/src/Makefile.in
+++ b/mozilla/content/html/content/src/Makefile.in
@@ -71,10 +71,18 @@ REQUIRES	= xpcom \
 		  intl \
 		  $(NULL)
 
+EXPORTS		= \
+		nsHTMLAtomList.h \
+		nsHTMLAtoms.h \
+		nsImageMapUtils.h \
+		$(NULL)
+
 CPPSRCS		= \
 		nsGenericHTMLElement.cpp \
 		nsGenericDOMHTMLCollection.cpp \
 		nsFormSubmission.cpp \
+		nsHTMLAtoms.cpp \
+		nsImageMapUtils.cpp \
 		nsHTMLAnchorElement.cpp \
 		nsHTMLAppletElement.cpp \
 		nsHTMLAreaElement.cpp \
@@ -128,9 +136,9 @@ FORCE_STATIC_LIB = 1
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
-		-I$(srcdir)/../../style/src \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../../events/src \
+		-I$(srcdir)/../../../../layout/style \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/mozilla/content/html/content/src/nsHTMLOptionElement.cpp b/mozilla/content/html/content/src/nsHTMLOptionElement.cpp
index c45225cbe4d..fc1bda03fd5 100644
--- a/mozilla/content/html/content/src/nsHTMLOptionElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLOptionElement.cpp
@@ -67,7 +67,6 @@
 #include "nsCOMPtr.h"
 #include "nsLayoutAtoms.h"
 #include "nsIEventStateManager.h"
-#include "nsXULAtoms.h"
 #include "nsIDOMDocument.h"
 
 /**
diff --git a/mozilla/content/html/document/src/Makefile.in b/mozilla/content/html/document/src/Makefile.in
index bd2aedc9703..566112a687f 100644
--- a/mozilla/content/html/document/src/Makefile.in
+++ b/mozilla/content/html/document/src/Makefile.in
@@ -98,7 +98,7 @@ include $(topsrcdir)/config/rules.mk
 INCLUDES	+= \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../content/src \
-		-I$(srcdir)/../../style/src \
+		-I$(srcdir)/../../../../layout/style \
 		-I$(srcdir)/../../../../dom/src/base \
 		$(NULL)
 
diff --git a/mozilla/content/svg/content/src/Makefile.in b/mozilla/content/svg/content/src/Makefile.in
index cd2cbc06f00..6016e7201d5 100644
--- a/mozilla/content/svg/content/src/Makefile.in
+++ b/mozilla/content/svg/content/src/Makefile.in
@@ -72,6 +72,7 @@ CPPSRCS		= \
 		nsSVGAnimatedPreserveAspectRatio.cpp \
 		nsSVGAnimatedString.cpp \
 		nsSVGAnimatedTransformList.cpp \
+		nsSVGAtoms.cpp \
 		nsSVGCircleElement.cpp \
 		nsSVGClassValue.cpp \
 		nsSVGCoordCtxProvider.cpp \
@@ -136,6 +137,8 @@ EXPORTS =  			\
 	nsSVGRect.h                \
 	nsSVGPoint.h               \
 	nsSVGMatrix.h              \
+	nsSVGAtomList.h            \
+	nsSVGAtoms.h               \
 	$(NULL)
 
 
@@ -149,7 +152,7 @@ INCLUDES += 	\
 		-I$(srcdir)/../../../../dom \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../../../layout/svg/base/src \
-		-I$(srcdir)/../../../html/style/src \
+		-I$(srcdir)/../../../../layout/style \
 		-I$(srcdir)/../../../html/content/src \
 		$(NULL)
 
diff --git a/mozilla/content/svg/document/src/Makefile.in b/mozilla/content/svg/document/src/Makefile.in
index 0df2422c470..a64805eda2e 100644
--- a/mozilla/content/svg/document/src/Makefile.in
+++ b/mozilla/content/svg/document/src/Makefile.in
@@ -77,7 +77,7 @@ INCLUDES	+= \
 		-I$(srcdir)/../../../xml/document/src \
 		-I$(srcdir)/../../../html/base/src \
 		-I$(srcdir)/../../../html/document/src \
-		-I$(srcdir)/../../../html/style/src \
+		-I$(srcdir)/../../../../layout/style \
 		-I$(srcdir)/../../../base/src \
 		$(NULL)
 
diff --git a/mozilla/content/xbl/src/Makefile.in b/mozilla/content/xbl/src/Makefile.in
index c21ae509930..bf26e31bc16 100644
--- a/mozilla/content/xbl/src/Makefile.in
+++ b/mozilla/content/xbl/src/Makefile.in
@@ -70,7 +70,13 @@ REQUIRES	= xpcom \
 		  intl \
 		  $(NULL)
 
+EXPORTS		= \
+		nsXBLAtomList.h \
+		nsXBLAtoms.h \
+		$(NULL)
+
 CPPSRCS		= \
+    nsXBLAtoms.cpp \
     nsXBLBinding.cpp \
     nsXBLPrototypeBinding.cpp \
     nsXBLPrototypeResources.cpp \
@@ -101,11 +107,11 @@ include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../base/src \
-		-I$(srcdir)/../../html/style/src \
 		-I$(srcdir)/../../html/base/src \
 		-I$(srcdir)/../../html/document/src \
 		-I$(srcdir)/../../xml/document/src \
 		-I$(srcdir)/../../xul/content/src \
+		-I$(srcdir)/../../../layout/style \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/mozilla/content/xml/document/src/Makefile.in b/mozilla/content/xml/document/src/Makefile.in
index 36f2d171707..5b261b87103 100644
--- a/mozilla/content/xml/document/src/Makefile.in
+++ b/mozilla/content/xml/document/src/Makefile.in
@@ -86,7 +86,7 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../../../xsl/document/src \
 		-I$(srcdir)/../../../html/document/src \
-		-I$(srcdir)/../../../html/style/src \
+		-I$(srcdir)/../../../../layout/style \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../../xul/content/src \
 		-I$(srcdir)/../../../../dom/src/base \
diff --git a/mozilla/content/xul/content/src/Makefile.in b/mozilla/content/xul/content/src/Makefile.in
index f1d5a68cd89..b4f0ed277fa 100644
--- a/mozilla/content/xul/content/src/Makefile.in
+++ b/mozilla/content/xul/content/src/Makefile.in
@@ -67,7 +67,13 @@ REQUIRES	= xpcom \
 		  pref \
 		  $(NULL)
 
+EXPORTS		= \
+		nsXULAtomList.h \
+		nsXULAtoms.h \
+		$(NULL)
+
 CPPSRCS		= \
+		nsXULAtoms.cpp \
 		nsXULElement.cpp \
 		nsXULPopupListener.cpp \
 		$(NULL)
@@ -84,7 +90,7 @@ LOCAL_INCLUDES	= \
 	-I$(srcdir)/../../../xml/content/src \
 	-I$(srcdir)/../../../base/src \
 	-I$(srcdir)/../../../xml/document/src \
-	-I$(srcdir)/../../../html/style/src \
+	-I$(srcdir)/../../../../layout/style \
 	-I$(srcdir)/../../../html/content/src \
 	$(NULL)
 
diff --git a/mozilla/content/xul/document/src/Makefile.in b/mozilla/content/xul/document/src/Makefile.in
index 6933801d246..9b8383ab48d 100644
--- a/mozilla/content/xul/document/src/Makefile.in
+++ b/mozilla/content/xul/document/src/Makefile.in
@@ -94,7 +94,7 @@ include $(topsrcdir)/config/rules.mk
 LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
 		  -I$(srcdir)/../../content/src \
 		  -I$(srcdir)/../../templates/src \
-		  -I$(srcdir)/../../../html/style/src \
+		  -I$(srcdir)/../../../../layout/style \
 		  -I$(srcdir)/../../../xml/document/src \
 		  $(NULL)
 
diff --git a/mozilla/embedding/components/build/Makefile.in b/mozilla/embedding/components/build/Makefile.in
index 923bb9637f8..d1184cc0e16 100644
--- a/mozilla/embedding/components/build/Makefile.in
+++ b/mozilla/embedding/components/build/Makefile.in
@@ -73,6 +73,7 @@ REQUIRES	= js \
 		  lwbrk \
 		  mimetype \
 		  content \
+		  layout \
 		  uriloader \
 		  necko \
 		  commandhandler \
diff --git a/mozilla/embedding/components/printingui/src/unixshared/Makefile.in b/mozilla/embedding/components/printingui/src/unixshared/Makefile.in
index 06fdd6f3611..3ca5b2acfcd 100644
--- a/mozilla/embedding/components/printingui/src/unixshared/Makefile.in
+++ b/mozilla/embedding/components/printingui/src/unixshared/Makefile.in
@@ -53,7 +53,7 @@ REQUIRES	= xpcom \
 		  js \
 		  xpconnect \
 		  caps \
-		  content \
+		  layout \
 		  necko \
 		  uriloader \
 		  docshell \
diff --git a/mozilla/embedding/components/webbrowserpersist/src/Makefile.in b/mozilla/embedding/components/webbrowserpersist/src/Makefile.in
index 08da2fc1336..e1a3858229a 100644
--- a/mozilla/embedding/components/webbrowserpersist/src/Makefile.in
+++ b/mozilla/embedding/components/webbrowserpersist/src/Makefile.in
@@ -48,6 +48,7 @@ REQUIRES	= xpcom \
 		  string \
 		  dom \
 		  content \
+		  layout \
 		  necko \
 		  widget \
 		  exthandler \
diff --git a/mozilla/embedding/config/basebrowser-installer-win.pkg b/mozilla/embedding/config/basebrowser-installer-win.pkg
index f63cc7d60a6..aeddf0ad5dc 100644
--- a/mozilla/embedding/config/basebrowser-installer-win.pkg
+++ b/mozilla/embedding/config/basebrowser-installer-win.pkg
@@ -72,6 +72,7 @@ components\gkcontent.dll
 components\gklayout.dll                   
 components\gkparser.dll                 
 components\layout_base.xpt              
+components\layout_printing.xpt              
 components\layout_xul.xpt               
 components\content_base.xpt
 res\dtd\xhtml11.dtd
diff --git a/mozilla/embedding/config/basebrowser-mac-macho b/mozilla/embedding/config/basebrowser-mac-macho
index 70d7d999100..15d2761b28d 100644
--- a/mozilla/embedding/config/basebrowser-mac-macho
+++ b/mozilla/embedding/config/basebrowser-mac-macho
@@ -105,6 +105,7 @@ components/layout_xul.xpt
 components/layout_xul_tree.xpt
 components/content_base.xpt
 components/layout_base.xpt              
+components/layout_printing.xpt              
 
 ; netwerk
 
diff --git a/mozilla/embedding/config/basebrowser-qnx b/mozilla/embedding/config/basebrowser-qnx
index 50d39df35d2..d1a71a5ee46 100644
--- a/mozilla/embedding/config/basebrowser-qnx
+++ b/mozilla/embedding/config/basebrowser-qnx
@@ -66,6 +66,7 @@ res/dtd/xhtml11.dtd
 components/libgklayout.so                   
 components/libhtmlpars.so                 
 components/layout_base.xpt              
+components/layout_printing.xpt              
 components/layout_xul.xpt
 components/layout_xul_tree.xpt               
 components/content_base.xpt
diff --git a/mozilla/embedding/config/basebrowser-unix b/mozilla/embedding/config/basebrowser-unix
index 7c1a5ca7f62..5658882b749 100644
--- a/mozilla/embedding/config/basebrowser-unix
+++ b/mozilla/embedding/config/basebrowser-unix
@@ -65,6 +65,7 @@ res/dtd/xhtml11.dtd
 components/libgklayout.so                   
 components/libhtmlpars.so                 
 components/layout_base.xpt              
+components/layout_printing.xpt              
 components/layout_xul.xpt
 components/layout_xul_tree.xpt               
 components/content_base.xpt
diff --git a/mozilla/embedding/config/basebrowser-win b/mozilla/embedding/config/basebrowser-win
index c1856452b56..f8ba44246e4 100644
--- a/mozilla/embedding/config/basebrowser-win
+++ b/mozilla/embedding/config/basebrowser-win
@@ -80,6 +80,7 @@ moz_art_lgpl.dll
 components\gklayout.dll                   
 components\gkparser.dll                 
 components\layout_base.xpt              
+components\layout_printing.xpt              
 components\layout_xul.xpt
 components\layout_xul_tree.xpt               
 components\content_base.xpt
diff --git a/mozilla/embedding/config/minimo-qnx b/mozilla/embedding/config/minimo-qnx
index 79c4f627acb..2492eec6827 100644
--- a/mozilla/embedding/config/minimo-qnx
+++ b/mozilla/embedding/config/minimo-qnx
@@ -58,6 +58,7 @@ res/dtd/xhtml11.dtd
 components/libgklayout.so                   
 components/libhtmlpars.so                 
 components/layout_base.xpt              
+components/layout_printing.xpt              
 components/layout_xul.xpt
 components/layout_xul_tree.xpt               
 components/content_base.xpt
diff --git a/mozilla/embedding/config/minimo-unix b/mozilla/embedding/config/minimo-unix
index ff268b66535..8a2bc32dfdc 100644
--- a/mozilla/embedding/config/minimo-unix
+++ b/mozilla/embedding/config/minimo-unix
@@ -57,6 +57,7 @@ res/dtd/xhtml11.dtd
 components/libgklayout.so                   
 components/libhtmlpars.so                 
 components/layout_base.xpt              
+components/layout_printing.xpt              
 components/layout_xul.xpt
 components/layout_xul_tree.xpt               
 components/content_base.xpt
diff --git a/mozilla/embedding/tests/cocoaEmbed/CocoaEmbed.pbproj/project.pbxproj b/mozilla/embedding/tests/cocoaEmbed/CocoaEmbed.pbproj/project.pbxproj
index 2ed64fc74e3..3d973fa5908 100644
--- a/mozilla/embedding/tests/cocoaEmbed/CocoaEmbed.pbproj/project.pbxproj
+++ b/mozilla/embedding/tests/cocoaEmbed/CocoaEmbed.pbproj/project.pbxproj
@@ -965,6 +965,11 @@
 			path = xpconnect.xpt;
 			refType = 4;
 		};
+		79C236190439FD4500202892 = {
+			isa = PBXFileReference;
+			path = layout_printing.xpt;
+			refType = 4;
+		};
 		79C2366E0439FF2600202892 = {
 			isa = PBXFileReference;
 			path = arrow.gif;
@@ -1730,6 +1735,12 @@
 			settings = {
 			};
 		};
+		79C23709043A00AC00202892 = {
+			fileRef = 79C236190439FD4500202892;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		79C2371A043A1AE800202892 = {
 			isa = PBXFileReference;
 			name = libwidget.rsrc;
@@ -1957,6 +1968,7 @@
 				79C236160439FD4500202892,
 				79C236170439FD4500202892,
 				79C236180439FD4500202892,
+				79C236190439FD4500202892,
 			);
 			isa = PBXGroup;
 			path = components;
@@ -2075,6 +2087,7 @@
 				79C236EF043A00AC00202892,
 				79C236F0043A00AC00202892,
 				79C236F1043A00AC00202892,
+				79C23709043A00AC00202892,
 			);
 			isa = PBXCopyFilesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/mozilla/extensions/inspector/base/src/Makefile.in b/mozilla/extensions/inspector/base/src/Makefile.in
index b4a9445e175..9e322736c9c 100644
--- a/mozilla/extensions/inspector/base/src/Makefile.in
+++ b/mozilla/extensions/inspector/base/src/Makefile.in
@@ -50,6 +50,7 @@ REQUIRES	= xpcom \
 		  gfx \
 		  layout \
 		  content \
+		  xul \
 		  widget \
 		  locale \
 		  necko \
diff --git a/mozilla/gfx/src/xlibrgb/Makefile.in b/mozilla/gfx/src/xlibrgb/Makefile.in
index d1f4641f324..36e284af3b4 100644
--- a/mozilla/gfx/src/xlibrgb/Makefile.in
+++ b/mozilla/gfx/src/xlibrgb/Makefile.in
@@ -43,7 +43,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xlibrgb
-XPIDL_MODULE	= layout
 LIBRARY_NAME	= xlibrgb
 EXPORT_LIBRARY = 1
 GRE_MODULE	= 1
diff --git a/mozilla/layout/Makefile.in b/mozilla/layout/Makefile.in
index 0552bf9c103..cf4a113bdf8 100644
--- a/mozilla/layout/Makefile.in
+++ b/mozilla/layout/Makefile.in
@@ -44,7 +44,15 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= layout
 
-DIRS		= base html xul
+DIRS		= \
+		style \
+		base \
+		generic \
+		forms \
+		printing \
+		tables \
+		xul \
+		$(NULL)
 
 ifdef MOZ_MATHML
 DIRS           += mathml
diff --git a/mozilla/layout/base/Makefile.in b/mozilla/layout/base/Makefile.in
index b0e8c7782b6..7e7dbbdfe73 100644
--- a/mozilla/layout/base/Makefile.in
+++ b/mozilla/layout/base/Makefile.in
@@ -42,7 +42,129 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public src
+MODULE		= layout
+XPIDL_MODULE	= layout_base
+GRE_MODULE	= 1
+LIBRARY_NAME	= gkbase_s
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  content \
+		  xul \
+		  xuldoc \
+		  gfx \
+		  widget \
+		  view \
+		  necko \
+		  docshell \
+		  webshell \
+		  webbrwsr \
+		  uriloader \
+		  js \
+		  xpconnect \
+		  plugin \
+		  locale \
+		  pref \
+		  imglib2 \
+		  unicharutil \
+		  htmlparser \
+		  util \
+		  windowwatcher \
+		  intl \
+		  accessibility \
+		  $(NULL)
+
+XPIDLSRCS	= \
+		nsIChromeEventHandler.idl	\
+		nsISelectionImageService.idl	\
+		$(NULL)
+
+EXPORTS		= \
+		nsBidi.h \
+		nsBidiPresUtils.h \
+		nsBidiUtils.h \
+		nsCSSFrameConstructor.h \
+		nsChangeHint.h \
+		nsCompatibility.h \
+		nsFrameManager.h \
+		nsFrameManagerBase.h \
+		nsFrameTraversal.h \
+		nsIAutoCopy.h \
+		nsICaret.h \
+		nsIDocumentViewer.h \
+		nsIFrameSelection.h \
+		nsIFrameTraversal.h \
+		nsIImageMap.h \
+		nsILayoutDebugger.h \
+		nsILayoutHistoryState.h \
+		nsIPercentHeightObserver.h  \
+		nsIPresShell.h \
+		nsIPresState.h \
+		nsIReflowCallback.h \
+		nsLayoutAtomList.h \
+		nsLayoutAtoms.h \
+		nsLayoutErrors.h \
+		nsLayoutUtils.h \
+		nsPresContext.h \
+		nsStyleChangeList.h \
+		nsStyleConsts.h \
+		$(NULL)
+
+CPPSRCS		= \
+		nsAutoCopy.cpp \
+		nsBidiUtils.cpp \
+		nsCSSColorUtils.cpp \
+		nsCSSFrameConstructor.cpp \
+		nsCSSRendering.cpp \
+		nsCaret.cpp \
+		nsChildIterator.cpp \
+		nsDocumentViewer.cpp \
+		nsFrameContentIterator.cpp \
+		nsFrameManager.cpp \
+		nsFrameTraversal.cpp \
+		nsImageLoader.cpp \
+		nsLayoutAtoms.cpp \
+		nsLayoutDebugger.cpp \
+		nsLayoutHistoryState.cpp \
+		nsLayoutUtils.cpp \
+		nsPresContext.cpp \
+		nsPresShell.cpp \
+		nsPresState.cpp \
+		nsQuoteList.cpp \
+		nsStyleChangeList.cpp \
+		$(NULL)
+
+ifdef IBMBIDI
+CPPSRCS		+= \
+		nsBidiPresUtils.cpp \
+		nsBidi.cpp \
+		$(NULL)
+endif                
+
+FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
+LOCAL_INCLUDES += \
+		-I$(srcdir) \
+		-I$(srcdir)/../generic \
+		-I$(srcdir)/../forms \
+		-I$(srcdir)/../tables \
+		-I$(srcdir)/../printing \
+		-I$(srcdir)/../xul/base/src \
+		-I$(srcdir)/../../content/events/src \
+		-I$(srcdir)/../../view/src \
+		$(NULL)
+
+ifdef MOZ_MATHML
+LOCAL_INCLUDES += \
+        -I$(srcdir)/../mathml/content/src \
+        -I$(srcdir)/../mathml/base/src
+endif
+
+ifdef MOZ_SVG
+LOCAL_INCLUDES += \
+        -I$(srcdir)/../svg/base/src
+endif
+
+DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in
index 782be6bd864..f997eea6bcb 100644
--- a/mozilla/layout/build/Makefile.in
+++ b/mozilla/layout/build/Makefile.in
@@ -106,23 +106,21 @@ CPPSRCS		= \
 EXPORTS		= nsLayoutCID.h
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/$(LIB_PREFIX)gkhtmlbase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)gkhtmldoc_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)gkhtmlforms_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)gkhtmlstyle_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)gkhtmltable_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)gkxulbase_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkgeneric_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkforms_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkstyle_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkprinting_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gktable_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkxulbase_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkconbase_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkconevents_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkconhtmlcon_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkconhtmldoc_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)gkconhtmlstyle_s.$(LIB_SUFFIX) \
 		$(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)gkconxuldoc_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)gkconshared_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkview_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)jsdombase_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)jsdomevents_s.$(LIB_SUFFIX) \
@@ -223,10 +221,10 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= -I$(srcdir)/../base/src \
-		   -I$(srcdir)/../html/base/src \
-		   -I$(srcdir)/../html/forms/src \
-		   -I$(srcdir)/../html/style/src \
+LOCAL_INCLUDES	+= -I$(srcdir)/../base \
+		   -I$(srcdir)/../generic \
+		   -I$(srcdir)/../forms \
+		   -I$(srcdir)/../style \
 		   -I$(srcdir)/../xul/content/src \
 		   -I$(srcdir)/../xul/base/src \
 		   -I$(srcdir)/../../content/base/src \
@@ -244,11 +242,11 @@ INCLUDES	+= -I$(srcdir)/../base/src \
 		   $(NULL)
 
 ifdef MOZ_MATHML
-INCLUDES += -I$(srcdir)/../mathml/content/src
+LOCAL_INCLUDES	+= -I$(srcdir)/../mathml/content/src
 endif
 
 ifdef MOZ_SVG
-INCLUDES += -I$(srcdir)/../../content/svg/content/src
+LOCAL_INCLUDES	+= -I$(srcdir)/../../content/svg/content/src
 endif
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/mozilla/layout/build/layout.pkg b/mozilla/layout/build/layout.pkg
index 3e07c871876..a6a567c9f2a 100644
--- a/mozilla/layout/build/layout.pkg
+++ b/mozilla/layout/build/layout.pkg
@@ -6,6 +6,7 @@ dist/bin/components/@SHARED_LIBRARY@
 #endif
 !xpt dist/bin/components/xuldoc.xpt
 !xpt dist/bin/components/layout_base.xpt
+!xpt dist/bin/components/layout_printing.xpt
 !xpt dist/bin/components/layout_xul.xpt
 !xpt dist/bin/components/content_base.xpt
 !xpt dist/bin/components/content_html.xpt
diff --git a/mozilla/layout/html/tests/Makefile.in b/mozilla/layout/html/tests/Makefile.in
index 24eac5ef5d6..f2685a5bc32 100644
--- a/mozilla/layout/html/tests/Makefile.in
+++ b/mozilla/layout/html/tests/Makefile.in
@@ -59,26 +59,23 @@ CPPSRCS		= \
 		TestCSSPropertyLookup.cpp \
 		$(NULL)
 
-LOCAL_INCLUDES	= -I$(srcdir)/../style/src
-
 EXTRA_DSO_LIBS += gkgfx
 
 LIBS		= \
 		$(LIBS_DIR) \
 		$(DIST)/lib/$(LIB_PREFIX)gkconhtmlcon_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkconhtmldoc_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)gkhtmlforms_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)gkhtmlstyle_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)gkconhtmlstyle_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)gkhtmltable_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)gkhtmlbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkforms_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkstyle_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gktable_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkprinting_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkgeneric_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkconbase_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkconevents_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkconxmlcon_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkconxmldoc_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkxulbase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)gkconshared_s.$(LIB_SUFFIX) \
 		$(MOZ_JS_LIBS) \
 		$(EXTRA_DSO_LIBS) \
 		$(TK_LIBS) \
diff --git a/mozilla/layout/mathml/base/src/Makefile.in b/mozilla/layout/mathml/base/src/Makefile.in
index c560bb1b943..afefe474807 100644
--- a/mozilla/layout/mathml/base/src/Makefile.in
+++ b/mozilla/layout/mathml/base/src/Makefile.in
@@ -67,10 +67,10 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 LOCAL_INCLUDES = \
-	-I$(srcdir)/../../../html/style/src \
-	-I$(srcdir)/../../../html/base/src \
-	-I$(srcdir)/../../../base/src \
-        -I$(srcdir)/../../../html/table/src \
+	-I$(srcdir)/../../../style \
+	-I$(srcdir)/../../../base \
+	-I$(srcdir)/../../../generic \
+        -I$(srcdir)/../../../tables \
 	-I$(srcdir)/../../content/src \
 	-I$(srcdir)/../../../xul/base/src \
 	$(NULL)
diff --git a/mozilla/layout/svg/base/src/Makefile.in b/mozilla/layout/svg/base/src/Makefile.in
index 302046d8bf1..42c7f92c7b9 100644
--- a/mozilla/layout/svg/base/src/Makefile.in
+++ b/mozilla/layout/svg/base/src/Makefile.in
@@ -90,16 +90,11 @@ FORCE_STATIC_LIB = 1
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
-		-I$(srcdir)/../../../base/src \
-		-I$(srcdir)/../../../html/table/src \
-		-I$(srcdir)/../../../html/style/src \
-		-I$(srcdir)/../../../html/base/src \
-		-I$(srcdir)/../../../html/forms/src \
-		-I$(srcdir)/../../../../content/svg/content/src \
-		-I$(srcdir)/../../../html/content/src \
-		-I$(srcdir)/../../../xml/content/src \
-		-I$(srcdir)/../../../base/public \
+		-I$(srcdir)/../../../base \
+		-I$(srcdir)/../../../generic \
+		-I$(srcdir)/../../../style \
 		-I$(srcdir)/../../../xul/base/src \
+		-I$(srcdir)/../../../../content/svg/content/src \
 		$(NULL)
 
 EXPORT_RESOURCE_CONTENT = \
diff --git a/mozilla/layout/xtf/src/Makefile.in b/mozilla/layout/xtf/src/Makefile.in
index 168df9ef092..24074255a97 100644
--- a/mozilla/layout/xtf/src/Makefile.in
+++ b/mozilla/layout/xtf/src/Makefile.in
@@ -77,17 +77,11 @@ FORCE_STATIC_LIB = 1
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
-		-I$(srcdir)/../../base/src \
-		-I$(srcdir)/../../html/table/src \
-		-I$(srcdir)/../../html/style/src \
-		-I$(srcdir)/../../html/base/src \
-		-I$(srcdir)/../../html/forms/src \
-		-I$(srcdir)/../../../content/svg/content/src \
-		-I$(srcdir)/../../html/content/src \
-		-I$(srcdir)/../../xml/content/src \
-		-I$(srcdir)/../../base/public \
-		-I$(srcdir)/../../svg/base/src \
+		-I$(srcdir)/../../generic \
 		-I$(srcdir)/../../xul/base/src \
 		$(NULL)
+ifdef MOZ_SVG
+LOCAL_INCLUDES	+= -I$(srcdir)/../../svg/base/src
+endif
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/mozilla/layout/xul/base/src/Makefile.in b/mozilla/layout/xul/base/src/Makefile.in
index 5cdd3ea1efb..a139652d470 100644
--- a/mozilla/layout/xul/base/src/Makefile.in
+++ b/mozilla/layout/xul/base/src/Makefile.in
@@ -49,6 +49,7 @@ REQUIRES	= xpcom \
 		  dom \
 		  locale \
 		  content \
+		  xul \
 		  gfx \
 		  widget \
 		  view \
@@ -140,13 +141,9 @@ include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
-		-I$(srcdir)/../../../base/src \
-		-I$(srcdir)/../../../html/style/src \
-		-I$(srcdir)/../../../html/base/src \
-		-I$(srcdir)/../../../html/forms/src \
-		-I$(srcdir)/../../content/src \
-		-I$(srcdir)/../../../xml/content/src \
-		-I$(srcdir)/../../../base/public \
+		-I$(srcdir)/../../../base \
+		-I$(srcdir)/../../../generic \
+		-I$(srcdir)/../../../style \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/mozilla/layout/xul/base/src/grid/Makefile.in b/mozilla/layout/xul/base/src/grid/Makefile.in
index 9c53d4ce922..cc182c51382 100644
--- a/mozilla/layout/xul/base/src/grid/Makefile.in
+++ b/mozilla/layout/xul/base/src/grid/Makefile.in
@@ -81,13 +81,9 @@ EXPORTS = \
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../../../base/src \
-		-I$(srcdir)/../../../../html/style/src \
-		-I$(srcdir)/../../../../html/base/src \
-		-I$(srcdir)/../../../../html/forms/src \
-		-I$(srcdir)/../../../content/src \
-		-I$(srcdir)/../../../../xml/content/src \
-		-I$(srcdir)/../../../../base/public \
-		-I$(srcdir)/../../../../xul/base/src \
+		-I$(srcdir)/../../../../generic \
+		-I$(srcdir)/../../../../style \
+		-I$(srcdir)/../../../../forms \
 		$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
diff --git a/mozilla/layout/xul/base/src/tree/src/Makefile.in b/mozilla/layout/xul/base/src/tree/src/Makefile.in
index 5e8a6ec814c..32fcf00793c 100644
--- a/mozilla/layout/xul/base/src/tree/src/Makefile.in
+++ b/mozilla/layout/xul/base/src/tree/src/Makefile.in
@@ -48,6 +48,7 @@ REQUIRES	= xpcom \
 		  string \
 		  dom \
 		  content \
+		  xul \
 		  gfx \
 		  widget \
 		  locale \
@@ -82,13 +83,10 @@ EXPORTS		= \
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../../../../base/src \
-		-I$(srcdir)/../../../../../html/style/src \
-		-I$(srcdir)/../../../../../html/base/src \
-		-I$(srcdir)/../../../../../html/forms/src \
-		-I$(srcdir)/../../../../content/src \
-		-I$(srcdir)/../../../../../xml/content/src \
-		-I$(srcdir)/../../../../../base/public \
-		-I$(srcdir)/../../../../../xul/base/src \
+		-I$(srcdir)/../../../../../base \
+		-I$(srcdir)/../../../../../generic \
+		-I$(srcdir)/../../../../../style \
+		-I$(srcdir)/../../../../../forms \
 		$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
diff --git a/mozilla/mail/config/basemail-os2 b/mozilla/mail/config/basemail-os2
index 66754a43471..30d4250d492 100644
--- a/mozilla/mail/config/basemail-os2
+++ b/mozilla/mail/config/basemail-os2
@@ -149,6 +149,7 @@ components\gfx.xpt
 components\gklayout.dll                   
 components\gkparser.dll                 
 components\layout_base.xpt              
+components\layout_printing.xpt              
 components\layout_xul.xpt               
 components\content_base.xpt
 components\htmlparser.xpt
diff --git a/mozilla/mail/config/basemail-unix b/mozilla/mail/config/basemail-unix
index 27861728b99..61eaa37b844 100644
--- a/mozilla/mail/config/basemail-unix
+++ b/mozilla/mail/config/basemail-unix
@@ -174,6 +174,7 @@ components/gfx.xpt
 ; layout
 components/libgklayout.so               
 components/layout_base.xpt              
+components/layout_printing.xpt              
 components/layout_xul.xpt               
 components/layout_xul_tree.xpt               
 components/content_base.xpt
@@ -190,6 +191,7 @@ components/xuldoc.xpt
 ;;res/dtd/xhtml11.dtd
 components/libgklayout.so                   
 components/layout_base.xpt              
+components/layout_printing.xpt              
 components/layout_xul.xpt
 components/layout_xul_tree.xpt               
 components/content_base.xpt
diff --git a/mozilla/mail/installer/windows/basemail-win b/mozilla/mail/installer/windows/basemail-win
index 784e0dc917a..ad54e36027a 100644
--- a/mozilla/mail/installer/windows/basemail-win
+++ b/mozilla/mail/installer/windows/basemail-win
@@ -169,6 +169,7 @@ bin\components\gfx.xpt
 
 ; layout
 bin\components\layout_base.xpt              
+bin\components\layout_printing.xpt              
 bin\components\layout_xul.xpt               
 bin\components\content_base.xpt
 bin\components\htmlparser.xpt
diff --git a/mozilla/mail/installer/windows/mail.jst b/mozilla/mail/installer/windows/mail.jst
index d642728ba4d..5012a8fdce2 100644
--- a/mozilla/mail/installer/windows/mail.jst
+++ b/mozilla/mail/installer/windows/mail.jst
@@ -604,6 +604,7 @@ function upgradeCleanup()
   deleteThisFile("Components",  "jsdservice.xpt");
   deleteThisFile("Components",  "jsurl.xpt");
   deleteThisFile("Components",  "layout_base.xpt");
+  deleteThisFile("Components",  "layout_printing.xpt");
   deleteThisFile("Components",  "layout_xul.xpt");
   deleteThisFile("Components",  "layout_xul_tree.xpt");
   deleteThisFile("Components",  "locale.xpt");
diff --git a/mozilla/parser/htmlparser/src/Makefile.in b/mozilla/parser/htmlparser/src/Makefile.in
index 5e1a89efe76..ae8db0d55d2 100644
--- a/mozilla/parser/htmlparser/src/Makefile.in
+++ b/mozilla/parser/htmlparser/src/Makefile.in
@@ -58,7 +58,7 @@ REQUIRES	= xpcom \
 		  uconv \
 		  unicharutil \
 		  expat \
-		  layout \
+		  content \
 		  dom \
 		  pref \
 		  nkcache \
diff --git a/mozilla/xpfe/browser/src/Makefile.in b/mozilla/xpfe/browser/src/Makefile.in
index e52d9edd8ad..fbad8ed19c1 100644
--- a/mozilla/xpfe/browser/src/Makefile.in
+++ b/mozilla/xpfe/browser/src/Makefile.in
@@ -53,7 +53,6 @@ REQUIRES	= xpcom \
 		  shistory \
 		  widget \
 		  gfx \
-		  content \
 		  docshell \
 		  appshell \
 		  appcomps \
diff --git a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp
index 824337847c5..66f66010213 100644
--- a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp
+++ b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp
@@ -62,7 +62,6 @@
 #include "nsIScriptContext.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIDOMDocument.h"
-#include "nsIDocument.h"
 #include "nsIDOMWindowInternal.h"
 
 #include "nsIContentViewer.h"
@@ -85,7 +84,6 @@
 
 #include "nsIAppStartup.h"
 
-#include "nsIDocumentViewer.h"
 #include "nsIBrowserHistory.h"
 #include "nsDocShellCID.h"
 
diff --git a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp
index 74ac72773c8..afa49fa8b27 100644
--- a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp
+++ b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp
@@ -58,7 +58,6 @@
 #include "nsCRT.h"
 #include "nsEscape.h"
 #include "nsIDocumentLoader.h"
-#include "nsIDocumentViewer.h"
 #include "nsIEnumerator.h"
 #include "nsIRDFService.h"
 #include "nsIScriptContext.h"
diff --git a/mozilla/xpinstall/packager/os2/browser.jst b/mozilla/xpinstall/packager/os2/browser.jst
index 5117833bd77..d623eb47de2 100644
--- a/mozilla/xpinstall/packager/os2/browser.jst
+++ b/mozilla/xpinstall/packager/os2/browser.jst
@@ -84,6 +84,7 @@ function upgradeCleanup()
   deleteThisFile("Components", "jsdservice.xpt");
   deleteThisFile("Components", "jsurl.xpt");
   deleteThisFile("Components", "layout_base.xpt");
+  deleteThisFile("Components", "layout_printing.xpt");
   deleteThisFile("Components", "layout_xul.xpt");
   deleteThisFile("Components", "layout_xul_tree.xpt");
   deleteThisFile("Components", "locale.xpt");
diff --git a/mozilla/xpinstall/packager/packages-os2 b/mozilla/xpinstall/packager/packages-os2
index db1bb5940f0..338ded3913b 100644
--- a/mozilla/xpinstall/packager/packages-os2
+++ b/mozilla/xpinstall/packager/packages-os2
@@ -157,6 +157,7 @@ bin/components/jar.xpt
 bin/components/jsconsole-clhandler.js
 bin/components/jsurl.xpt
 bin/components/layout_base.xpt
+bin/components/layout_printing.xpt
 bin/components/layout_xul.xpt
 bin/components/layout_xul_tree.xpt
 bin/components/locale.xpt
diff --git a/mozilla/xpinstall/packager/packages-static-unix b/mozilla/xpinstall/packager/packages-static-unix
index bbc0f0e1b73..4ef8939225a 100644
--- a/mozilla/xpinstall/packager/packages-static-unix
+++ b/mozilla/xpinstall/packager/packages-static-unix
@@ -162,6 +162,7 @@ bin/components/chrome.xpt
 bin/components/docshell.xpt
 bin/components/jsurl.xpt
 bin/components/layout_base.xpt
+bin/components/layout_printing.xpt
 bin/components/layout_xul.xpt
 bin/components/layout_xul_tree.xpt
 bin/components/xuldoc.xpt
diff --git a/mozilla/xpinstall/packager/packages-unix b/mozilla/xpinstall/packager/packages-unix
index 826d71cb6ab..531ec477d87 100644
--- a/mozilla/xpinstall/packager/packages-unix
+++ b/mozilla/xpinstall/packager/packages-unix
@@ -213,6 +213,7 @@ bin/components/xpconnect.xpt
 bin/components/docshell.xpt
 bin/components/jsurl.xpt
 bin/components/layout_base.xpt
+bin/components/layout_printing.xpt
 bin/components/layout_xul.xpt
 bin/components/layout_xul_tree.xpt
 bin/components/xuldoc.xpt
diff --git a/mozilla/xpinstall/packager/windows/browser.jst b/mozilla/xpinstall/packager/windows/browser.jst
index 4c263b98f99..0b51bca9a5b 100644
--- a/mozilla/xpinstall/packager/windows/browser.jst
+++ b/mozilla/xpinstall/packager/windows/browser.jst
@@ -499,6 +499,7 @@ function upgradeCleanup()
     deleteThisFile("Components", "jar.xpt");
     deleteThisFile("Components", "jsurl.xpt");
     deleteThisFile("Components", "layout_base.xpt");
+    deleteThisFile("Components", "layout_printing.xpt");
     deleteThisFile("Components", "layout_xul.xpt");
     deleteThisFile("Components", "locale.xpt");
     deleteThisFile("Components", "necko_about.xpt");