diff --git a/dom/svg/DOMSVGTransformList.cpp b/dom/svg/DOMSVGTransformList.cpp
index 0ba1b77a78c7..847be954eb9e 100644
--- a/dom/svg/DOMSVGTransformList.cpp
+++ b/dom/svg/DOMSVGTransformList.cpp
@@ -5,11 +5,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "DOMSVGTransformList.h"
+
+#include "mozilla/dom/SVGElement.h"
 #include "mozilla/dom/SVGTransform.h"
 #include "mozilla/dom/SVGMatrix.h"
-#include "SVGAnimatedTransformList.h"
-#include "SVGElement.h"
 #include "mozilla/dom/SVGTransformListBinding.h"
+#include "SVGAnimatedTransformList.h"
 #include "nsError.h"
 #include <algorithm>
 
diff --git a/dom/svg/DOMSVGTransformList.h b/dom/svg/DOMSVGTransformList.h
index eb813d6c2903..8275a806fde8 100644
--- a/dom/svg/DOMSVGTransformList.h
+++ b/dom/svg/DOMSVGTransformList.h
@@ -10,8 +10,8 @@
 #include "DOMSVGAnimatedTransformList.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsDebug.h"
-#include "nsTArray.h"
 #include "SVGTransformList.h"
+#include "nsTArray.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/ErrorResult.h"
 
diff --git a/dom/svg/SVGAnimatedTransformList.cpp b/dom/svg/SVGAnimatedTransformList.cpp
index 0be642ff06d2..1b860af36433 100644
--- a/dom/svg/SVGAnimatedTransformList.cpp
+++ b/dom/svg/SVGAnimatedTransformList.cpp
@@ -7,13 +7,13 @@
 #include "SVGAnimatedTransformList.h"
 
 #include "mozilla/dom/MutationEventBinding.h"
-#include "DOMSVGAnimatedTransformList.h"
 #include "mozilla/dom/SVGAnimationElement.h"
 #include "mozilla/Move.h"
 #include "nsCharSeparatedTokenizer.h"
-#include "nsSVGTransform.h"
-#include "nsSMILValue.h"
+#include "DOMSVGAnimatedTransformList.h"
 #include "SVGContentUtils.h"
+#include "nsSMILValue.h"
+#include "nsSVGTransform.h"
 #include "SVGTransformListSMILType.h"
 
 using namespace mozilla::dom;
diff --git a/dom/svg/SVGElement.cpp b/dom/svg/SVGElement.cpp
index e20cfaef129e..e21e51099281 100644
--- a/dom/svg/SVGElement.cpp
+++ b/dom/svg/SVGElement.cpp
@@ -10,51 +10,51 @@
 
 #include "SVGElement.h"
 
+#include "mozilla/dom/MutationEventBinding.h"
+#include "mozilla/dom/SVGAnimatedEnumeration.h"
+#include "mozilla/dom/SVGElementBinding.h"
 #include "mozilla/dom/SVGLengthBinding.h"
 #include "mozilla/dom/SVGSVGElement.h"
 #include "mozilla/dom/SVGTests.h"
 #include "mozilla/dom/SVGUnitTypesBinding.h"
+#include "mozilla/DeclarationBlock.h"
+#include "mozilla/EventListenerManager.h"
+#include "mozilla/InternalMutationEvent.h"
+#include "mozilla/RestyleManager.h"
+#include "mozilla/Unused.h"
+#include "mozAutoDocUpdate.h"
+#include "nsAttrValueOrString.h"
+#include "nsCSSProps.h"
 #include "nsContentUtils.h"
 #include "nsICSSDeclaration.h"
 #include "nsIContentInlines.h"
 #include "nsIDocument.h"
-#include "mozilla/InternalMutationEvent.h"
-#include "mozAutoDocUpdate.h"
 #include "nsError.h"
-#include "nsIPresShell.h"
 #include "nsGkAtoms.h"
-#include "nsCSSProps.h"
-#include "mozilla/EventListenerManager.h"
+#include "nsIPresShell.h"
+#include "nsIFrame.h"
 #include "nsLayoutUtils.h"
-#include "SVGAnimatedTransformList.h"
-#include "nsSVGLength2.h"
-#include "nsSVGNumber2.h"
-#include "nsSVGNumberPair.h"
-#include "nsSVGInteger.h"
-#include "nsSVGIntegerPair.h"
+#include "nsSMILAnimationController.h"
 #include "nsSVGAngle.h"
 #include "nsSVGBoolean.h"
 #include "nsSVGEnum.h"
-#include "nsSVGViewBox.h"
+#include "nsSVGInteger.h"
+#include "nsSVGIntegerPair.h"
+#include "nsSVGLength2.h"
+#include "nsSVGNumber2.h"
+#include "nsSVGNumberPair.h"
 #include "nsSVGString.h"
-#include "mozilla/dom/SVGAnimatedEnumeration.h"
+#include "nsSVGViewBox.h"
 #include "SVGAnimatedNumberList.h"
 #include "SVGAnimatedLengthList.h"
 #include "SVGAnimatedPointList.h"
 #include "SVGAnimatedPathSegList.h"
+#include "SVGAnimatedTransformList.h"
 #include "SVGContentUtils.h"
 #include "SVGGeometryElement.h"
-#include "nsIFrame.h"
+#include "SVGMotionSMILAttr.h"
 #include "nsQueryObject.h"
 #include <stdarg.h>
-#include "SVGMotionSMILAttr.h"
-#include "nsAttrValueOrString.h"
-#include "nsSMILAnimationController.h"
-#include "mozilla/dom/MutationEventBinding.h"
-#include "mozilla/dom/SVGElementBinding.h"
-#include "mozilla/DeclarationBlock.h"
-#include "mozilla/Unused.h"
-#include "mozilla/RestyleManager.h"
 
 // This is needed to ensure correct handling of calls to the
 // vararg-list methods in this file:
diff --git a/dom/svg/SVGElement.h b/dom/svg/SVGElement.h
index 9236a92c0217..d4b4c44d1840 100644
--- a/dom/svg/SVGElement.h
+++ b/dom/svg/SVGElement.h
@@ -13,18 +13,18 @@
 */
 
 #include "mozilla/Attributes.h"
+#include "mozilla/dom/DOMRect.h"
+#include "mozilla/dom/Element.h"
+#include "mozilla/gfx/MatrixFwd.h"
 #include "nsAutoPtr.h"
 #include "nsChangeHint.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsError.h"
-#include "mozilla/dom/DOMRect.h"
-#include "mozilla/dom/Element.h"
-#include "mozilla/gfx/MatrixFwd.h"
 #include "nsISupportsImpl.h"
 #include "nsStyledElement.h"
-#include "nsSVGClass.h"
 #include "SVGContentUtils.h"
+#include "nsSVGClass.h"
 #include "gfxMatrix.h"
 
 class nsSVGAngle;
diff --git a/dom/svg/SVGFragmentIdentifier.cpp b/dom/svg/SVGFragmentIdentifier.cpp
index 54b47a26ca66..4e4da5f21d56 100644
--- a/dom/svg/SVGFragmentIdentifier.cpp
+++ b/dom/svg/SVGFragmentIdentifier.cpp
@@ -8,9 +8,9 @@
 
 #include "mozilla/dom/SVGSVGElement.h"
 #include "mozilla/dom/SVGViewElement.h"
+#include "nsCharSeparatedTokenizer.h"
 #include "nsContentUtils.h"  // for nsCharSeparatedTokenizerTemplate
 #include "SVGAnimatedTransformList.h"
-#include "nsCharSeparatedTokenizer.h"
 
 namespace mozilla {
 
diff --git a/dom/svg/SVGGradientElement.cpp b/dom/svg/SVGGradientElement.cpp
index e8bc3a5ebbcd..8776266aa2b6 100644
--- a/dom/svg/SVGGradientElement.cpp
+++ b/dom/svg/SVGGradientElement.cpp
@@ -7,15 +7,15 @@
 #include "mozilla/dom/SVGGradientElement.h"
 
 #include "mozilla/ArrayUtils.h"
-#include "DOMSVGAnimatedTransformList.h"
+#include "mozilla/dom/SVGElement.h"
 #include "mozilla/dom/SVGGradientElementBinding.h"
-#include "mozilla/dom/SVGRadialGradientElementBinding.h"
 #include "mozilla/dom/SVGLengthBinding.h"
 #include "mozilla/dom/SVGLinearGradientElementBinding.h"
+#include "mozilla/dom/SVGRadialGradientElementBinding.h"
 #include "mozilla/dom/SVGUnitTypesBinding.h"
+#include "DOMSVGAnimatedTransformList.h"
 #include "nsCOMPtr.h"
 #include "nsGkAtoms.h"
-#include "SVGElement.h"
 
 NS_IMPL_NS_NEW_SVG_ELEMENT(LinearGradient)
 NS_IMPL_NS_NEW_SVG_ELEMENT(RadialGradient)
diff --git a/dom/svg/SVGGradientElement.h b/dom/svg/SVGGradientElement.h
index f41c8f90348e..4f42fd35f86b 100644
--- a/dom/svg/SVGGradientElement.h
+++ b/dom/svg/SVGGradientElement.h
@@ -10,8 +10,8 @@
 #include "nsAutoPtr.h"
 #include "SVGAnimatedTransformList.h"
 #include "SVGElement.h"
-#include "nsSVGLength2.h"
 #include "nsSVGEnum.h"
+#include "nsSVGLength2.h"
 #include "nsSVGString.h"
 
 class nsSVGGradientFrame;
diff --git a/dom/svg/SVGPatternElement.cpp b/dom/svg/SVGPatternElement.cpp
index 5344196b1aaf..24d9d2097d91 100644
--- a/dom/svg/SVGPatternElement.cpp
+++ b/dom/svg/SVGPatternElement.cpp
@@ -4,15 +4,15 @@
  * 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/. */
 
-#include "mozilla/ArrayUtils.h"
-
-#include "nsCOMPtr.h"
-#include "nsGkAtoms.h"
-#include "DOMSVGAnimatedTransformList.h"
-#include "mozilla/dom/SVGLengthBinding.h"
 #include "mozilla/dom/SVGPatternElement.h"
+
+#include "mozilla/ArrayUtils.h"
+#include "mozilla/dom/SVGLengthBinding.h"
 #include "mozilla/dom/SVGPatternElementBinding.h"
 #include "mozilla/dom/SVGUnitTypesBinding.h"
+#include "DOMSVGAnimatedTransformList.h"
+#include "nsCOMPtr.h"
+#include "nsGkAtoms.h"
 
 NS_IMPL_NS_NEW_SVG_ELEMENT(Pattern)
 
diff --git a/dom/svg/SVGPatternElement.h b/dom/svg/SVGPatternElement.h
index bb0fa1550a78..4a6d4761d227 100644
--- a/dom/svg/SVGPatternElement.h
+++ b/dom/svg/SVGPatternElement.h
@@ -8,13 +8,13 @@
 #define mozilla_dom_SVGPatternElement_h
 
 #include "nsAutoPtr.h"
+#include "mozilla/dom/SVGElement.h"
+#include "SVGAnimatedPreserveAspectRatio.h"
+#include "SVGAnimatedTransformList.h"
 #include "nsSVGEnum.h"
 #include "nsSVGLength2.h"
 #include "nsSVGString.h"
-#include "SVGElement.h"
 #include "nsSVGViewBox.h"
-#include "SVGAnimatedPreserveAspectRatio.h"
-#include "SVGAnimatedTransformList.h"
 
 class nsSVGPatternFrame;
 
diff --git a/dom/svg/SVGSVGElement.cpp b/dom/svg/SVGSVGElement.cpp
index f32f26e8a34d..ad009e8ad91f 100644
--- a/dom/svg/SVGSVGElement.cpp
+++ b/dom/svg/SVGSVGElement.cpp
@@ -15,16 +15,16 @@
 #include "DOMSVGLength.h"
 #include "DOMSVGNumber.h"
 #include "DOMSVGPoint.h"
-#include "nsLayoutStylesheetCache.h"
-#include "nsSVGAngle.h"
 #include "nsFrameSelection.h"
+#include "nsLayoutStylesheetCache.h"
 #include "nsIFrame.h"
 #include "nsISVGSVGFrame.h"
 #include "nsSMILAnimationController.h"
 #include "nsSMILTimeContainer.h"
+#include "nsSVGAngle.h"
+#include "SVGAngle.h"
 #include "nsSVGDisplayableFrame.h"
 #include "nsSVGUtils.h"
-#include "SVGAngle.h"
 
 NS_IMPL_NS_NEW_SVG_ELEMENT_CHECK_PARSER(SVG)
 
diff --git a/dom/svg/SVGTransform.cpp b/dom/svg/SVGTransform.cpp
index 7e4504ba956c..72ab71ac0bd0 100644
--- a/dom/svg/SVGTransform.cpp
+++ b/dom/svg/SVGTransform.cpp
@@ -9,11 +9,11 @@
 #include "mozilla/dom/SVGTransform.h"
 #include "mozilla/dom/SVGMatrix.h"
 #include "mozilla/dom/SVGTransformBinding.h"
+#include "mozilla/DebugOnly.h"
+#include "mozilla/FloatingPoint.h"
 #include "nsError.h"
 #include "SVGAnimatedTransformList.h"
 #include "nsSVGAttrTearoffTable.h"
-#include "mozilla/DebugOnly.h"
-#include "mozilla/FloatingPoint.h"
 
 namespace {
 const double kRadPerDegree = 2.0 * M_PI / 360.0;
diff --git a/dom/svg/SVGTransformList.h b/dom/svg/SVGTransformList.h
index 72ed259e2e9e..8f0c55dfb81b 100644
--- a/dom/svg/SVGTransformList.h
+++ b/dom/svg/SVGTransformList.h
@@ -8,9 +8,8 @@
 #define MOZILLA_SVGTRANSFORMLIST_H__
 
 #include "gfxMatrix.h"
-#include "nsDebug.h"
-#include "nsTArray.h"
 #include "nsSVGTransform.h"
+#include "nsTArray.h"
 
 namespace mozilla {
 
diff --git a/dom/svg/SVGTransformableElement.cpp b/dom/svg/SVGTransformableElement.cpp
index 57401c07da09..783148282519 100644
--- a/dom/svg/SVGTransformableElement.cpp
+++ b/dom/svg/SVGTransformableElement.cpp
@@ -4,19 +4,20 @@
  * 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/. */
 
+#include "SVGTransformableElement.h"
+
+#include "DOMSVGAnimatedTransformList.h"
 #include "gfx2DGlue.h"
 #include "mozilla/dom/MutationEventBinding.h"
-#include "DOMSVGAnimatedTransformList.h"
 #include "mozilla/dom/SVGGraphicsElementBinding.h"
-#include "mozilla/dom/SVGTransformableElement.h"
 #include "mozilla/dom/SVGMatrix.h"
+#include "mozilla/dom/SVGRect.h"
 #include "mozilla/dom/SVGSVGElement.h"
 #include "nsContentUtils.h"
 #include "nsIFrame.h"
-#include "nsSVGDisplayableFrame.h"
-#include "mozilla/dom/SVGRect.h"
-#include "nsSVGUtils.h"
 #include "SVGContentUtils.h"
+#include "nsSVGDisplayableFrame.h"
+#include "nsSVGUtils.h"
 
 using namespace mozilla::gfx;
 
diff --git a/dom/svg/SVGTransformableElement.h b/dom/svg/SVGTransformableElement.h
index 6b457f3e11c9..204e807ab8bf 100644
--- a/dom/svg/SVGTransformableElement.h
+++ b/dom/svg/SVGTransformableElement.h
@@ -7,11 +7,11 @@
 #ifndef SVGTransformableElement_h
 #define SVGTransformableElement_h
 
-#include "mozilla/Attributes.h"
 #include "nsAutoPtr.h"
 #include "SVGAnimatedTransformList.h"
-#include "SVGElement.h"
 #include "gfxMatrix.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/dom/SVGElement.h"
 #include "mozilla/gfx/Matrix.h"
 
 namespace mozilla {
diff --git a/dom/svg/SVGViewportElement.h b/dom/svg/SVGViewportElement.h
index 4e63689a8709..8e92cd673efb 100644
--- a/dom/svg/SVGViewportElement.h
+++ b/dom/svg/SVGViewportElement.h
@@ -7,18 +7,18 @@
 #ifndef mozilla_dom_SVGViewportElement_h
 #define mozilla_dom_SVGViewportElement_h
 
+#include "mozilla/Attributes.h"
 #include "mozilla/dom/FromParser.h"
 #include "nsAutoPtr.h"
 #include "nsIContentInlines.h"
 #include "nsISVGPoint.h"
+#include "SVGAnimatedPreserveAspectRatio.h"
 #include "nsSVGEnum.h"
-#include "nsSVGLength2.h"
 #include "SVGGraphicsElement.h"
 #include "SVGImageContext.h"
-#include "nsSVGViewBox.h"
 #include "SVGPreserveAspectRatio.h"
-#include "SVGAnimatedPreserveAspectRatio.h"
-#include "mozilla/Attributes.h"
+#include "nsSVGLength2.h"
+#include "nsSVGViewBox.h"
 
 class nsSVGOuterSVGFrame;
 class nsSVGViewportFrame;