diff --git a/content/xbl/src/moz.build b/content/xbl/src/moz.build
index 1d7e0e900ef5..e8a93d589343 100644
--- a/content/xbl/src/moz.build
+++ b/content/xbl/src/moz.build
@@ -14,7 +14,7 @@ EXPORTS.mozilla.dom += [
     'XBLChildrenElement.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsBindingManager.cpp',
     'nsXBLBinding.cpp',
     'nsXBLContentSink.cpp',
diff --git a/content/xbl/src/nsXBLResourceLoader.h b/content/xbl/src/nsXBLResourceLoader.h
index 114fcd2fab03..ab7fe285232f 100644
--- a/content/xbl/src/nsXBLResourceLoader.h
+++ b/content/xbl/src/nsXBLResourceLoader.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 nsXBLResourceLoader_h
+#define nsXBLResourceLoader_h
+
 #include "mozilla/Attributes.h"
 #include "nsCOMPtr.h"
 #include "nsICSSLoaderObserver.h"
@@ -62,3 +65,4 @@ public:
   nsCOMArray<nsIContent> mBoundElements;
 };
 
+#endif