diff --git a/content/svg/content/src/SVGContentUtils.h b/content/svg/content/src/SVGContentUtils.h
index b5918d45f298..50adc05bb609 100644
--- a/content/svg/content/src/SVGContentUtils.h
+++ b/content/svg/content/src/SVGContentUtils.h
@@ -10,8 +10,10 @@
 #define _USE_MATH_DEFINES
 #include <math.h>
 
-#include "gfxMatrix.h"
+#include "mozilla/gfx/Matrix.h"
 #include "mozilla/RangedPtr.h"
+#include "nsError.h"
+#include "nsStringFwd.h"
 
 class nsIContent;
 class nsIDocument;
diff --git a/content/svg/content/src/SVGFECompositeElement.cpp b/content/svg/content/src/SVGFECompositeElement.cpp
index 3e473d62f865..27b095f6aaf4 100644
--- a/content/svg/content/src/SVGFECompositeElement.cpp
+++ b/content/svg/content/src/SVGFECompositeElement.cpp
@@ -5,7 +5,6 @@
 
 #include "mozilla/dom/SVGFECompositeElement.h"
 #include "mozilla/dom/SVGFECompositeElementBinding.h"
-#include "gfxContext.h"
 
 NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(FEComposite)
 
diff --git a/content/svg/content/src/SVGFEFloodElement.cpp b/content/svg/content/src/SVGFEFloodElement.cpp
index 83e7cd7769aa..44786ba2bc3a 100644
--- a/content/svg/content/src/SVGFEFloodElement.cpp
+++ b/content/svg/content/src/SVGFEFloodElement.cpp
@@ -4,9 +4,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/SVGFEFloodElement.h"
+
+#include "FilterSupport.h"
 #include "mozilla/dom/SVGFEFloodElementBinding.h"
-#include "gfxContext.h"
-#include "gfxColor.h"
+#include "nsColor.h"
 #include "nsIFrame.h"
 
 NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(FEFlood)
diff --git a/content/svg/content/src/SVGFETileElement.cpp b/content/svg/content/src/SVGFETileElement.cpp
index d456ab243876..294200623503 100644
--- a/content/svg/content/src/SVGFETileElement.cpp
+++ b/content/svg/content/src/SVGFETileElement.cpp
@@ -6,7 +6,6 @@
 #include "mozilla/dom/SVGFETileElement.h"
 #include "mozilla/dom/SVGFETileElementBinding.h"
 #include "nsSVGFilterInstance.h"
-#include "gfxUtils.h"
 
 NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(FETile)
 
diff --git a/content/svg/content/src/SVGPathSegUtils.cpp b/content/svg/content/src/SVGPathSegUtils.cpp
index bcc886827728..709ba0e56b9f 100644
--- a/content/svg/content/src/SVGPathSegUtils.cpp
+++ b/content/svg/content/src/SVGPathSegUtils.cpp
@@ -8,6 +8,7 @@
 #include "SVGPathSegUtils.h"
 
 #include "gfx2DGlue.h"
+#include "gfxPoint.h"
 #include "nsSVGPathDataParser.h"
 #include "nsTextFormatter.h"
 
diff --git a/content/svg/content/src/SVGPathSegUtils.h b/content/svg/content/src/SVGPathSegUtils.h
index 9a1b5d4c367a..dc6c8b4eecad 100644
--- a/content/svg/content/src/SVGPathSegUtils.h
+++ b/content/svg/content/src/SVGPathSegUtils.h
@@ -6,7 +6,6 @@
 #ifndef MOZILLA_SVGPATHSEGUTILS_H__
 #define MOZILLA_SVGPATHSEGUTILS_H__
 
-#include "gfxPoint.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/gfx/Point.h"
 #include "nsDebug.h"
diff --git a/content/svg/content/src/nsSVGFilters.cpp b/content/svg/content/src/nsSVGFilters.cpp
index 5e301ee20bdd..822d633f4174 100644
--- a/content/svg/content/src/nsSVGFilters.cpp
+++ b/content/svg/content/src/nsSVGFilters.cpp
@@ -23,13 +23,10 @@
 #include "nsSVGUtils.h"
 #include "nsStyleContext.h"
 #include "nsIFrame.h"
-#include "gfxContext.h"
-#include "gfxMatrix.h"
 #include "imgIContainer.h"
 #include "nsNetUtil.h"
 #include "mozilla/dom/SVGFilterElement.h"
 #include "nsSVGString.h"
-#include "gfxUtils.h"
 #include "SVGContentUtils.h"
 #include <algorithm>
 #include "mozilla/dom/SVGAnimatedLength.h"
diff --git a/content/svg/content/src/nsSVGFilters.h b/content/svg/content/src/nsSVGFilters.h
index 4e3d8b1985c0..a148aa2336f4 100644
--- a/content/svg/content/src/nsSVGFilters.h
+++ b/content/svg/content/src/nsSVGFilters.h
@@ -14,7 +14,6 @@
 #include "nsSVGNumber2.h"
 #include "nsSVGNumberPair.h"
 #include "FilterSupport.h"
-#include "gfxASurface.h"
 
 class nsSVGFilterInstance;
 class nsSVGFilterResource;
diff --git a/content/svg/content/src/nsSVGPathDataParser.h b/content/svg/content/src/nsSVGPathDataParser.h
index 738fb35f8465..f4e842b4adf3 100644
--- a/content/svg/content/src/nsSVGPathDataParser.h
+++ b/content/svg/content/src/nsSVGPathDataParser.h
@@ -8,7 +8,6 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/gfx/Point.h"
-#include "gfxPoint.h"
 #include "nsSVGDataParser.h"
 
 namespace mozilla {