diff --git a/dom/svg/DOMSVGAnimatedNumber.h b/dom/svg/DOMSVGAnimatedNumber.h
index 7b66b0c95ebc..4b11ebc9b486 100644
--- a/dom/svg/DOMSVGAnimatedNumber.h
+++ b/dom/svg/DOMSVGAnimatedNumber.h
@@ -7,7 +7,6 @@
 #ifndef DOM_SVG_DOMSVGANIMATEDNUMBER_H_
 #define DOM_SVG_DOMSVGANIMATEDNUMBER_H_
 
-#include "nsISupports.h"
 #include "nsWrapperCache.h"
 
 #include "SVGElement.h"
diff --git a/dom/svg/DOMSVGAnimatedNumberList.cpp b/dom/svg/DOMSVGAnimatedNumberList.cpp
index ec2fd3e55d3f..fe529031fc4d 100644
--- a/dom/svg/DOMSVGAnimatedNumberList.cpp
+++ b/dom/svg/DOMSVGAnimatedNumberList.cpp
@@ -29,13 +29,8 @@ SVGAnimatedNumberListTearoffTable() {
 NS_SVG_VAL_IMPL_CYCLE_COLLECTION_WRAPPERCACHED(DOMSVGAnimatedNumberList,
                                                mElement)
 
-NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMSVGAnimatedNumberList)
-NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMSVGAnimatedNumberList)
-
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMSVGAnimatedNumberList)
-  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
-  NS_INTERFACE_MAP_ENTRY(nsISupports)
-NS_INTERFACE_MAP_END
+NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(DOMSVGAnimatedNumberList, AddRef)
+NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(DOMSVGAnimatedNumberList, Release)
 
 JSObject* DOMSVGAnimatedNumberList::WrapObject(
     JSContext* aCx, JS::Handle<JSObject*> aGivenProto) {
diff --git a/dom/svg/DOMSVGAnimatedNumberList.h b/dom/svg/DOMSVGAnimatedNumberList.h
index 5478c52b78ec..19861a3abccd 100644
--- a/dom/svg/DOMSVGAnimatedNumberList.h
+++ b/dom/svg/DOMSVGAnimatedNumberList.h
@@ -37,13 +37,12 @@ class DOMSVGNumberList;
  * out our pointers to them when they die (making our pointers to them true
  * weak refs).
  */
-class DOMSVGAnimatedNumberList final : public nsISupports,
-                                       public nsWrapperCache {
+class DOMSVGAnimatedNumberList final : public nsWrapperCache {
   friend class DOMSVGNumberList;
 
  public:
-  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMSVGAnimatedNumberList)
+  NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(DOMSVGAnimatedNumberList)
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(DOMSVGAnimatedNumberList)
 
   /**
    * Factory method to create and return a DOMSVGAnimatedNumberList wrapper
diff --git a/dom/svg/DOMSVGTransform.h b/dom/svg/DOMSVGTransform.h
index be942bb618f8..93aeef8bfd9b 100644
--- a/dom/svg/DOMSVGTransform.h
+++ b/dom/svg/DOMSVGTransform.h
@@ -50,9 +50,9 @@ class DOMSVGTransform final : public nsWrapperCache {
    *   SVGTransformList.createSVGTransformFromMatrix(in DOMMatrix2DInit  matrix)
    * which do not initially belong to an attribute.
    */
-  explicit DOMSVGTransform();
+  DOMSVGTransform();
   explicit DOMSVGTransform(const gfxMatrix& aMatrix);
-  explicit DOMSVGTransform(const DOMMatrix2DInit& aMatrix, ErrorResult& rv);
+  DOMSVGTransform(const DOMMatrix2DInit& aMatrix, ErrorResult& rv);
 
   /**
    * Ctor for creating an unowned copy. Used with Clone().
diff --git a/dom/svg/SVGAnimatedString.h b/dom/svg/SVGAnimatedString.h
index ebef30e61bd5..c6b0a98c63c8 100644
--- a/dom/svg/SVGAnimatedString.h
+++ b/dom/svg/SVGAnimatedString.h
@@ -7,7 +7,6 @@
 #ifndef DOM_SVG_SVGANIMATEDSTRING_H_
 #define DOM_SVG_SVGANIMATEDSTRING_H_
 
-#include "DOMSVGAnimatedString.h"
 #include "nsError.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/SVGAnimatedClassOrString.h"
diff --git a/dom/svg/SVGFEConvolveMatrixElement.h b/dom/svg/SVGFEConvolveMatrixElement.h
index fba506bccc63..e3cdcb3db043 100644
--- a/dom/svg/SVGFEConvolveMatrixElement.h
+++ b/dom/svg/SVGFEConvolveMatrixElement.h
@@ -7,7 +7,6 @@
 #ifndef DOM_SVG_SVGFECONVOLVEMATRIXELEMENT_H_
 #define DOM_SVG_SVGFECONVOLVEMATRIXELEMENT_H_
 
-#include "DOMSVGAnimatedNumberList.h"
 #include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedEnumeration.h"
 #include "SVGAnimatedInteger.h"
diff --git a/dom/svg/SVGMarkerElement.h b/dom/svg/SVGMarkerElement.h
index 6b00f9774cfa..6b4130f038df 100644
--- a/dom/svg/SVGMarkerElement.h
+++ b/dom/svg/SVGMarkerElement.h
@@ -7,8 +7,6 @@
 #ifndef DOM_SVG_SVGMARKERELEMENT_H_
 #define DOM_SVG_SVGMARKERELEMENT_H_
 
-#include "DOMSVGAnimatedAngle.h"
-#include "DOMSVGAnimatedEnumeration.h"
 #include "SVGAnimatedEnumeration.h"
 #include "SVGAnimatedLength.h"
 #include "SVGAnimatedOrient.h"
@@ -29,6 +27,9 @@ class SVGMarkerFrame;
 
 namespace dom {
 
+class DOMSVGAnimatedAngle;
+class DOMSVGAnimatedEnumeration;
+
 // Non-Exposed Marker Orientation Types
 static const uint16_t SVG_MARKER_ORIENT_AUTO_START_REVERSE = 3;
 
diff --git a/dom/svg/SVGTextContentElement.h b/dom/svg/SVGTextContentElement.h
index 5e204fb490e8..697c016a41ec 100644
--- a/dom/svg/SVGTextContentElement.h
+++ b/dom/svg/SVGTextContentElement.h
@@ -8,7 +8,6 @@
 #define DOM_SVG_SVGTEXTCONTENTELEMENT_H_
 
 #include "mozilla/dom/SVGGraphicsElement.h"
-#include "DOMSVGAnimatedEnumeration.h"
 #include "SVGAnimatedEnumeration.h"
 #include "SVGAnimatedLength.h"
 
@@ -19,6 +18,7 @@ class SVGTextFrame;
 namespace dom {
 
 struct DOMPointInit;
+class DOMSVGAnimatedEnumeration;
 class DOMSVGPoint;
 class SVGRect;