diff --git a/embedding/browser/webBrowser/moz.build b/embedding/browser/webBrowser/moz.build
index c3df2afe206..0397c649e3c 100644
--- a/embedding/browser/webBrowser/moz.build
+++ b/embedding/browser/webBrowser/moz.build
@@ -35,7 +35,7 @@ EXPORTS += [
     'nsCTooltipTextProvider.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsCommandHandler.cpp',
     'nsContextMenuInfo.cpp',
     'nsDocShellTreeOwner.cpp',
diff --git a/embedding/browser/webBrowser/nsEmbedStream.h b/embedding/browser/webBrowser/nsEmbedStream.h
index 71336d5ba3c..8684b632d1c 100644
--- a/embedding/browser/webBrowser/nsEmbedStream.h
+++ b/embedding/browser/webBrowser/nsEmbedStream.h
@@ -3,6 +3,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#ifndef nsEmbedStream_h__
+#define nsEmbedStream_h__
+
 #include "nsCOMPtr.h"
 #include "nsIOutputStream.h"
 #include "nsIURI.h"
@@ -27,5 +30,6 @@ class nsEmbedStream : public nsISupports
  private:
   nsIWebBrowser            *mOwner;
   nsCOMPtr<nsIOutputStream> mOutputStream;
-
 };
+
+#endif // nsEmbedStream_h__
diff --git a/embedding/components/commandhandler/src/moz.build b/embedding/components/commandhandler/src/moz.build
index 5e835fdd094..9635cc48bb0 100644
--- a/embedding/components/commandhandler/src/moz.build
+++ b/embedding/components/commandhandler/src/moz.build
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsBaseCommandController.cpp',
     'nsCommandGroup.cpp',
     'nsCommandManager.cpp',
diff --git a/embedding/components/find/src/moz.build b/embedding/components/find/src/moz.build
index 9ec140ec3d4..7ae493c4b7e 100644
--- a/embedding/components/find/src/moz.build
+++ b/embedding/components/find/src/moz.build
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsFind.cpp',
     'nsWebBrowserFind.cpp',
 ]
diff --git a/embedding/components/printingui/src/mac/moz.build b/embedding/components/printingui/src/mac/moz.build
index 8239a4e3a53..8df6f3b9e5d 100644
--- a/embedding/components/printingui/src/mac/moz.build
+++ b/embedding/components/printingui/src/mac/moz.build
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
 ]
diff --git a/embedding/components/printingui/src/unixshared/moz.build b/embedding/components/printingui/src/unixshared/moz.build
index a73647de600..d28e810dce5 100644
--- a/embedding/components/printingui/src/unixshared/moz.build
+++ b/embedding/components/printingui/src/unixshared/moz.build
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsPrintingPromptService.cpp',
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
diff --git a/embedding/components/printingui/src/win/moz.build b/embedding/components/printingui/src/win/moz.build
index 78976b92ea0..0e4d6ac7b68 100644
--- a/embedding/components/printingui/src/win/moz.build
+++ b/embedding/components/printingui/src/win/moz.build
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsPrintDialogUtil.cpp',
     'nsPrintingPromptService.cpp',
     'nsPrintProgress.cpp',
diff --git a/embedding/components/windowwatcher/src/moz.build b/embedding/components/windowwatcher/src/moz.build
index fe6ac564fde..f23dacad70c 100644
--- a/embedding/components/windowwatcher/src/moz.build
+++ b/embedding/components/windowwatcher/src/moz.build
@@ -4,13 +4,13 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsAutoWindowStateHelper.cpp',
     'nsWindowWatcher.cpp',
 ]
 
 if CONFIG['MOZ_XUL']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'nsDialogParamBlock.cpp',
     ]