9 files changed, 31 insertions, 15 deletions
diff --git a/layout/base/moz.build b/layout/base/moz.build
index 86377e9db8..bdc6655706 100644
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -118,7 +118,7 @@ EXPORTS.mozilla += [
     'StaticPresData.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'AccessibleCaret.cpp',
     'AccessibleCaretEventHub.cpp',
     'AccessibleCaretManager.cpp',
@@ -150,11 +150,9 @@ SOURCES += [
     'nsLayoutDebugger.cpp',
     'nsLayoutHistoryState.cpp',
     'nsLayoutUtils.cpp',
-    'nsPresArena.cpp',
     'nsPresContext.cpp',
     'nsPresShell.cpp',
     'nsQuoteList.cpp',
-    'nsRefreshDriver.cpp',
     'nsStyleChangeList.cpp',
     'nsStyleSheetService.cpp',
     'PaintTracker.cpp',
@@ -170,6 +168,13 @@ SOURCES += [
     'ZoomConstraintsClient.cpp',
 ]
 
+# nsPresArena.cpp needs to be built separately because it uses plarena.h.
+# nsRefreshDriver.cpp needs to be built separately because of name clashes in the OS X headers
+SOURCES += [
+    'nsPresArena.cpp',
+    'nsRefreshDriver.cpp',
+]
+
 if CONFIG['ENABLE_TESTS']:
     DIRS += ['gtest']
 
diff --git a/layout/generic/moz.build b/layout/generic/moz.build
index 199b3c679b..1fb80a4d3b 100644
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -123,7 +123,7 @@ EXPORTS.mozilla.layout += [
     'FrameChildList.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'AsyncScrollBase.cpp',
     'BlockReflowInput.cpp',
     'CSSAlignUtils.cpp',
@@ -157,11 +157,9 @@ SOURCES += [
     'nsIntervalSet.cpp',
     'nsLeafFrame.cpp',
     'nsLineBox.cpp',
-    'nsLineLayout.cpp',
     'nsPageContentFrame.cpp',
     'nsPageFrame.cpp',
     'nsPlaceholderFrame.cpp',
-    'nsPluginFrame.cpp',
     'nsRubyBaseContainerFrame.cpp',
     'nsRubyBaseFrame.cpp',
     'nsRubyContentFrame.cpp',
@@ -187,6 +185,13 @@ SOURCES += [
     'TextOverflow.cpp',
 ]
 
+# nsLineLayout.cpp needs to be built separately because it uses plarena.h.
+# nsPluginFrame.cpp needs to be built separately because of name clashes in the OS X headers.
+SOURCES += [
+    'nsLineLayout.cpp',
+    'nsPluginFrame.cpp',
+]
+
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
diff --git a/layout/printing/moz.build b/layout/printing/moz.build
index 869464919a..cfae6a3d2c 100644
--- a/layout/printing/moz.build
+++ b/layout/printing/moz.build
@@ -17,7 +17,7 @@ EXPORTS.mozilla.layout += [
 
 XPIDL_MODULE = 'layout_printing'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'ipc/RemotePrintJobChild.cpp',
     'ipc/RemotePrintJobParent.cpp',
     'nsPagePrintTimer.cpp',
diff --git a/layout/style/moz.build b/layout/style/moz.build
index 7f08fc236a..066d8d3f80 100644
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -138,7 +138,7 @@ EXPORTS.mozilla.css += [
     'StyleRule.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'AnimationCollection.cpp',
     'AnimationCommon.cpp',
     'CounterStyleManager.cpp',
@@ -169,7 +169,6 @@ SOURCES += [
     'nsCSSProps.cpp',
     'nsCSSPseudoClasses.cpp',
     'nsCSSPseudoElements.cpp',
-    'nsCSSRuleProcessor.cpp',
     'nsCSSRules.cpp',
     'nsCSSScanner.cpp',
     'nsCSSValue.cpp',
@@ -182,7 +181,6 @@ SOURCES += [
     'nsFontFaceUtils.cpp',
     'nsHTMLCSSStyleSheet.cpp',
     'nsHTMLStyleSheet.cpp',
-    'nsLayoutStylesheetCache.cpp',
     'nsMediaFeatures.cpp',
     'nsNthIndexCache.cpp',
     'nsROCSSPrimitiveValue.cpp',
@@ -208,6 +206,14 @@ SOURCES += [
     'SVGAttrAnimationRuleProcessor.cpp',
 ]
 
+# nsCSSRuleProcessor.cpp needs to be built separately because it uses plarena.h.
+# nsLayoutStylesheetCache.cpp needs to be built separately because it uses
+# nsExceptionHandler.h, which includes windows.h.
+SOURCES += [
+    'nsCSSRuleProcessor.cpp',
+    'nsLayoutStylesheetCache.cpp',
+]
+
 EXTRA_COMPONENTS += [
     'CSSUnprefixingService.js',
     'CSSUnprefixingService.manifest',
diff --git a/layout/svg/moz.build b/layout/svg/moz.build
index 0def568b0d..b6575862fa 100644
--- a/layout/svg/moz.build
+++ b/layout/svg/moz.build
@@ -20,7 +20,7 @@ EXPORTS.mozilla += [
     'SVGContextPaint.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsCSSClipPathInstance.cpp',
     'nsCSSFilterInstance.cpp',
     'nsFilterInstance.cpp',
diff --git a/layout/tables/moz.build b/layout/tables/moz.build
index c068290fef..556a5de823 100644
--- a/layout/tables/moz.build
+++ b/layout/tables/moz.build
@@ -12,7 +12,7 @@ EXPORTS += [
     'nsITableCellLayout.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'BasicTableLayoutStrategy.cpp',
     'FixedTableLayoutStrategy.cpp',
     'nsCellMap.cpp',
diff --git a/layout/xul/grid/moz.build b/layout/xul/grid/moz.build
index 33f8e9f07b..6050be64e7 100644
--- a/layout/xul/grid/moz.build
+++ b/layout/xul/grid/moz.build
@@ -18,7 +18,7 @@ EXPORTS += [
     'nsIGridPart.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsGrid.cpp',
     'nsGridCell.cpp',
     'nsGridLayout2.cpp',
diff --git a/layout/xul/moz.build b/layout/xul/moz.build
index fa5204af90..d90d8f1e88 100644
--- a/layout/xul/moz.build
+++ b/layout/xul/moz.build
@@ -37,7 +37,7 @@ EXPORTS.mozilla.dom += [
     'ScrollBoxObject.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'BoxObject.cpp',
     'ContainerBoxObject.cpp',
     'ListBoxObject.cpp',
diff --git a/layout/xul/tree/moz.build b/layout/xul/tree/moz.build
index 706ccdd7ac..e15c80b082 100644
--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@@ -26,7 +26,7 @@ EXPORTS.mozilla.dom += [
     'TreeBoxObject.h'
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsTreeBodyFrame.cpp',
     'nsTreeColFrame.cpp',
     'nsTreeColumns.cpp',