6 files changed, 15 insertions, 1 deletions
diff --git a/dom/xul/templates/moz.build b/dom/xul/templates/moz.build
index 3beb0b7e5..780f01941 100644
--- a/dom/xul/templates/moz.build
+++ b/dom/xul/templates/moz.build
@@ -17,7 +17,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'xultmpl'
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsContentSupportMap.cpp',
     'nsContentTestNode.cpp',
     'nsInstantiationNode.cpp',
diff --git a/dom/xul/templates/nsInstantiationNode.cpp b/dom/xul/templates/nsInstantiationNode.cpp
index 9079d4189..ebf12acad 100644
--- a/dom/xul/templates/nsInstantiationNode.cpp
+++ b/dom/xul/templates/nsInstantiationNode.cpp
@@ -8,6 +8,9 @@
 #include "nsXULTemplateQueryProcessorRDF.h"
 
 #include "mozilla/Logging.h"
+
+using namespace mozilla;
+
 extern mozilla::LazyLogModule gXULTemplateLog;
 
 nsInstantiationNode::nsInstantiationNode(nsXULTemplateQueryProcessorRDF* aProcessor,
diff --git a/dom/xul/templates/nsTemplateMap.h b/dom/xul/templates/nsTemplateMap.h
index cb828b093..dfa7d611a 100644
--- a/dom/xul/templates/nsTemplateMap.h
+++ b/dom/xul/templates/nsTemplateMap.h
@@ -9,6 +9,8 @@
 #include "PLDHashTable.h"
 #include "nsXULElement.h"
 
+using mozilla::fallible;
+
 class nsTemplateMap {
 protected:
     struct Entry : public PLDHashEntryHdr {
diff --git a/dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp b/dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp
index 732e545d0..ecf6b64c5 100644
--- a/dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp
+++ b/dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp
@@ -35,6 +35,10 @@
 #include "nsXULSortService.h"
 #include "nsIDocument.h"
 
+#include "mozilla/Logging.h"
+
+using namespace mozilla;
+
 //----------------------------------------------------------------------
 
 #define PARSE_TYPE_INTEGER  "Integer"
diff --git a/dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp b/dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp
index a70307bf5..cd7c32eae 100644
--- a/dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp
+++ b/dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp
@@ -28,6 +28,8 @@
 #include "nsIDocument.h"
 #include "nsNetUtil.h"
 
+using mozilla::fallible;
+
 //----------------------------------------------------------------------
 //
 // nsXULTemplateResultSetStorage
diff --git a/dom/xul/templates/nsXULTreeBuilder.cpp b/dom/xul/templates/nsXULTreeBuilder.cpp
index b42133484..3356700be 100644
--- a/dom/xul/templates/nsXULTreeBuilder.cpp
+++ b/dom/xul/templates/nsXULTreeBuilder.cpp
@@ -32,6 +32,9 @@
 #include "nsTreeContentView.h"
 #include "nsIXULStore.h"
 #include "mozilla/BinarySearch.h"
+#include "mozilla/Logging.h"
+
+using mozilla::LogLevel;
 
 // For security check
 #include "nsIDocument.h"