7 files changed, 10 insertions, 1 deletions
diff --git a/dom/smil/moz.build b/dom/smil/moz.build
index 5b37ce642..3c432898f 100644
--- a/dom/smil/moz.build
+++ b/dom/smil/moz.build
@@ -35,7 +35,7 @@ EXPORTS.mozilla.dom += [
     'TimeEvent.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsSMILAnimationController.cpp',
     'nsSMILAnimationFunction.cpp',
     'nsSMILCompositor.cpp',
diff --git a/dom/smil/nsSMILAnimationFunction.cpp b/dom/smil/nsSMILAnimationFunction.cpp
index 767181897..cd57054fb 100644
--- a/dom/smil/nsSMILAnimationFunction.cpp
+++ b/dom/smil/nsSMILAnimationFunction.cpp
@@ -24,6 +24,7 @@
 #include <math.h>
 #include <algorithm>
 
+using namespace mozilla;
 using namespace mozilla::dom;
 
 //----------------------------------------------------------------------
diff --git a/dom/smil/nsSMILCSSProperty.cpp b/dom/smil/nsSMILCSSProperty.cpp
index e74512443..14e428c05 100644
--- a/dom/smil/nsSMILCSSProperty.cpp
+++ b/dom/smil/nsSMILCSSProperty.cpp
@@ -17,6 +17,7 @@
 #include "nsIDOMElement.h"
 #include "nsIDocument.h"
 
+using namespace mozilla;
 using namespace mozilla::dom;
 
 // Helper function
diff --git a/dom/smil/nsSMILCSSValueType.cpp b/dom/smil/nsSMILCSSValueType.cpp
index ed89e7710..2940c1367 100644
--- a/dom/smil/nsSMILCSSValueType.cpp
+++ b/dom/smil/nsSMILCSSValueType.cpp
@@ -18,6 +18,7 @@
 #include "nsDebug.h"
 #include "nsStyleUtil.h"
 #include "nsIDocument.h"
+#include "nsComputedDOMStyle.h"
 
 using namespace mozilla::dom;
 using mozilla::StyleAnimationValue;
diff --git a/dom/smil/nsSMILCompositor.cpp b/dom/smil/nsSMILCompositor.cpp
index fe7b2c828..e7bf60932 100644
--- a/dom/smil/nsSMILCompositor.cpp
+++ b/dom/smil/nsSMILCompositor.cpp
@@ -9,6 +9,9 @@
 #include "nsCSSProps.h"
 #include "nsHashKeys.h"
 #include "nsSMILCSSProperty.h"
+#include "mozilla/CSSEnabledState.h"
+
+using namespace mozilla;
 
 // PLDHashEntryHdr methods
 bool
diff --git a/dom/smil/nsSMILInstanceTime.h b/dom/smil/nsSMILInstanceTime.h
index d5a5807e3..4602c9127 100644
--- a/dom/smil/nsSMILInstanceTime.h
+++ b/dom/smil/nsSMILInstanceTime.h
@@ -8,6 +8,7 @@
 #define NS_SMILINSTANCETIME_H_
 
 #include "nsSMILTimeValue.h"
+#include "nsISupports.h"
 
 class nsSMILInterval;
 class nsSMILTimeContainer;
diff --git a/dom/smil/nsSMILTimeContainer.cpp b/dom/smil/nsSMILTimeContainer.cpp
index 3df8a64ca..e3ebf5b09 100644
--- a/dom/smil/nsSMILTimeContainer.cpp
+++ b/dom/smil/nsSMILTimeContainer.cpp
@@ -11,6 +11,8 @@
 
 #include "mozilla/AutoRestore.h"
 
+using namespace mozilla;
+
 nsSMILTimeContainer::nsSMILTimeContainer()
 :
   mParent(nullptr),