Bug 721131 - Speed up build in content/svg/content/src - clean up #include directives in its header files. r=dholbert.

content/svg/content/src/DOMSVGAnimatedLengthList.h

@@ -37,12 +37,11 @@
 #ifndef MOZILLA_DOMSVGANIMATEDLENGTHLIST_H__
 #define MOZILLA_DOMSVGANIMATEDLENGTHLIST_H__
 
-#include "nsIDOMSVGAnimatedLengthList.h"
-#include "nsCycleCollectionParticipant.h"
 #include "nsAutoPtr.h"
-#include "nsTArray.h"
-
-class nsSVGElement;
+#include "nsCOMPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsIDOMSVGAnimatedLengthList.h"
+#include "nsSVGElement.h"
 
 namespace mozilla {
 

content/svg/content/src/DOMSVGAnimatedNumberList.h

@@ -37,18 +37,17 @@
 #ifndef MOZILLA_DOMSVGANIMATEDNUMBERLIST_H__
 #define MOZILLA_DOMSVGANIMATEDNUMBERLIST_H__
 
-#include "nsIDOMSVGAnimatedNumberList.h"
-#include "nsCycleCollectionParticipant.h"
 #include "nsAutoPtr.h"
-#include "nsTArray.h"
-
-class nsSVGElement;
+#include "nsCOMPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsIDOMSVGAnimatedNumberList.h"
+#include "nsSVGElement.h"
 
 namespace mozilla {
 
+class DOMSVGNumberList;
 class SVGAnimatedNumberList;
 class SVGNumberList;
-class DOMSVGNumberList;
 
 /**
  * Class DOMSVGAnimatedNumberList

content/svg/content/src/DOMSVGAnimatedTransformList.h

@@ -40,18 +40,16 @@
 #ifndef MOZILLA_DOMSVGANIMATEDTRANSFORMLIST_H__
 #define MOZILLA_DOMSVGANIMATEDTRANSFORMLIST_H__
 
-#include "nsIDOMSVGAnimTransformList.h"
-#include "nsCycleCollectionParticipant.h"
 #include "nsAutoPtr.h"
-#include "nsTArray.h"
-
-class nsSVGElement;
+#include "nsCOMPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsIDOMSVGAnimTransformList.h"
+#include "nsSVGElement.h"
 
 namespace mozilla {
 
-class SVGAnimatedTransformList;
-class SVGTransformList;
 class DOMSVGTransformList;
+class SVGAnimatedTransformList;
 
 /**
  * Class DOMSVGAnimatedTransformList

content/svg/content/src/DOMSVGLength.h

@@ -37,11 +37,13 @@
 #ifndef MOZILLA_DOMSVGLENGTH_H__
 #define MOZILLA_DOMSVGLENGTH_H__
 
-#include "nsIDOMSVGLength.h"
 #include "DOMSVGLengthList.h"
-#include "SVGLength.h"
-#include "nsCycleCollectionParticipant.h"
 #include "nsAutoPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsDebug.h"
+#include "nsIDOMSVGLength.h"
+#include "nsTArray.h"
+#include "SVGLength.h"
 
 class nsSVGElement;
 

content/svg/content/src/DOMSVGLengthList.h

@@ -37,13 +37,15 @@
 #ifndef MOZILLA_DOMSVGLENGTHLIST_H__
 #define MOZILLA_DOMSVGLENGTHLIST_H__
 
-#include "nsIDOMSVGLengthList.h"
-#include "SVGLengthList.h"
-#include "SVGLength.h"
 #include "DOMSVGAnimatedLengthList.h"
-#include "nsCOMArray.h"
 #include "nsAutoPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsDebug.h"
+#include "nsIDOMSVGLengthList.h"
+#include "nsTArray.h"
+#include "SVGLengthList.h"
 
+class nsIDOMSVGLength;
 class nsSVGElement;
 
 namespace mozilla {

content/svg/content/src/DOMSVGMatrix.h

@@ -71,11 +71,11 @@
 #ifndef MOZILLA_DOMSVGMATRIX_H__
 #define MOZILLA_DOMSVGMATRIX_H__
 
-#include "nsIDOMSVGMatrix.h"
 #include "DOMSVGTransform.h"
 #include "gfxMatrix.h"
 #include "nsAutoPtr.h"
 #include "nsCycleCollectionParticipant.h"
+#include "nsIDOMSVGMatrix.h"
 
 // We make DOMSVGMatrix a pseudo-interface to allow us to QI to it in order
 // to check that the objects that scripts pass in are our *native* matrix

content/svg/content/src/DOMSVGNumber.h

@@ -37,10 +37,11 @@
 #ifndef MOZILLA_DOMSVGNUMBER_H__
 #define MOZILLA_DOMSVGNUMBER_H__
 
-#include "nsIDOMSVGNumber.h"
 #include "DOMSVGNumberList.h"
-#include "nsCycleCollectionParticipant.h"
 #include "nsAutoPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsIDOMSVGNumber.h"
+#include "nsTArray.h"
 
 class nsSVGElement;
 

content/svg/content/src/DOMSVGNumberList.h

@@ -37,11 +37,13 @@
 #ifndef MOZILLA_DOMSVGNUMBERLIST_H__
 #define MOZILLA_DOMSVGNUMBERLIST_H__
 
-#include "nsIDOMSVGNumberList.h"
-#include "SVGNumberList.h"
 #include "DOMSVGAnimatedNumberList.h"
-#include "nsCOMArray.h"
 #include "nsAutoPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsDebug.h"
+#include "nsIDOMSVGNumberList.h"
+#include "nsTArray.h"
+#include "SVGNumberList.h"
 
 class nsSVGElement;
 

content/svg/content/src/DOMSVGPathSeg.cpp

@@ -43,6 +43,7 @@
 #include "nsSVGElement.h"
 #include "nsIDOMSVGPathSeg.h"
 #include "nsDOMError.h"
+#include "nsContentUtils.h"
 
 // See the architecture comment in DOMSVGPathSegList.h.
 

content/svg/content/src/DOMSVGPathSeg.h

@@ -37,11 +37,10 @@
 #ifndef MOZILLA_DOMSVGPATHSEG_H__
 #define MOZILLA_DOMSVGPATHSEG_H__
 
-#include "nsIDOMSVGPathSeg.h"
 #include "DOMSVGPathSegList.h"
-#include "SVGPathSegUtils.h"
-#include "nsCycleCollectionParticipant.h"
 #include "nsAutoPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsIDOMSVGPathSeg.h"
 
 class nsSVGElement;
 

content/svg/content/src/DOMSVGPathSegList.cpp

@@ -41,6 +41,7 @@
 #include "SVGAnimatedPathSegList.h"
 #include "nsCOMPtr.h"
 #include "nsSVGAttrTearoffTable.h"
+#include "SVGPathSegUtils.h"
 
 // See the comment in this file's header.
 

content/svg/content/src/DOMSVGPathSegList.h

@@ -37,13 +37,16 @@
 #ifndef MOZILLA_DOMSVGPATHSEGLIST_H__
 #define MOZILLA_DOMSVGPATHSEGLIST_H__
 
-#include "nsIDOMSVGPathSegList.h"
-#include "SVGPathData.h"
-#include "SVGPathSegUtils.h"
-#include "nsCOMArray.h"
 #include "nsAutoPtr.h"
+#include "nsCOMPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsDebug.h"
+#include "nsIDOMSVGPathSegList.h"
+#include "nsSVGElement.h"
+#include "nsTArray.h"
+#include "SVGPathData.h" // IWYU pragma: keep
 
-class nsSVGElement;
+class nsIDOMSVGPathSeg;
 
 namespace mozilla {
 

content/svg/content/src/DOMSVGPoint.h

@@ -37,13 +37,14 @@
 #ifndef MOZILLA_DOMSVGPOINT_H__
 #define MOZILLA_DOMSVGPOINT_H__
 
-#include "nsIDOMSVGPoint.h"
 #include "DOMSVGPointList.h"
-#include "SVGPoint.h"
 #include "gfxPoint.h"
-#include "nsCycleCollectionParticipant.h"
 #include "nsAutoPtr.h"
-#include "nsMathUtils.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsDebug.h"
+#include "nsIDOMSVGPoint.h"
+#include "nsTArray.h"
+#include "SVGPoint.h"
 
 class nsSVGElement;
 

content/svg/content/src/DOMSVGPointList.h

@@ -37,13 +37,16 @@
 #ifndef MOZILLA_DOMSVGPOINTLIST_H__
 #define MOZILLA_DOMSVGPOINTLIST_H__
 
-#include "nsIDOMSVGPointList.h"
-#include "SVGPointList.h"
-#include "SVGPoint.h"
-#include "nsCOMArray.h"
 #include "nsAutoPtr.h"
+#include "nsCOMPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsDebug.h"
+#include "nsIDOMSVGPointList.h"
+#include "nsSVGElement.h"
+#include "nsTArray.h"
+#include "SVGPointList.h" // IWYU pragma: keep
 
-class nsSVGElement;
+class nsIDOMSVGPoint;
 
 namespace mozilla {
 

content/svg/content/src/DOMSVGStringList.h

@@ -38,12 +38,11 @@
 #ifndef MOZILLA_DOMSVGSTRINGLIST_H__
 #define MOZILLA_DOMSVGSTRINGLIST_H__
 
-#include "nsIDOMSVGStringList.h"
-#include "nsCycleCollectionParticipant.h"
-#include "nsCOMArray.h"
 #include "nsAutoPtr.h"
-
-class nsSVGElement;
+#include "nsCOMPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsIDOMSVGStringList.h"
+#include "nsSVGElement.h"
 
 namespace mozilla {
 

content/svg/content/src/DOMSVGTests.h

@@ -39,8 +39,17 @@
 #define MOZILLA_DOMSVGTESTS_H__
 
 #include "nsIDOMSVGTests.h"
+#include "nsStringFwd.h"
 #include "SVGStringList.h"
 
+class nsAttrValue;
+class nsIAtom;
+class nsString;
+
+namespace mozilla {
+class DOMSVGStringList;
+}
+
 class DOMSVGTests : public nsIDOMSVGTests
 {
 public:

content/svg/content/src/DOMSVGTransform.h

@@ -41,11 +41,18 @@
 #ifndef MOZILLA_DOMSVGTRANSFORM_H__
 #define MOZILLA_DOMSVGTRANSFORM_H__
 
-#include "nsIDOMSVGTransform.h"
 #include "DOMSVGTransformList.h"
-#include "SVGTransform.h"
-#include "nsCycleCollectionParticipant.h"
 #include "nsAutoPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsDebug.h"
+#include "nsID.h"
+#include "nsIDOMSVGTransform.h"
+#include "nsTArray.h"
+#include "SVGTransform.h"
+
+class nsSVGElement;
+
+struct gfxMatrix;
 
 // We make DOMSVGTransform a pseudo-interface to allow us to QI to it in order
 // to check that the objects that scripts pass in are our our *native* transform

content/svg/content/src/DOMSVGTransformList.h

@@ -41,12 +41,15 @@
 #ifndef MOZILLA_DOMSVGTRANSFORMLIST_H__
 #define MOZILLA_DOMSVGTRANSFORMLIST_H__
 
-#include "nsIDOMSVGTransformList.h"
-#include "SVGTransformList.h"
 #include "DOMSVGAnimatedTransformList.h"
-#include "nsCOMArray.h"
 #include "nsAutoPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsDebug.h"
+#include "nsIDOMSVGTransformList.h"
+#include "nsTArray.h"
+#include "SVGTransformList.h"
 
+class nsIDOMSVGTransform;
 class nsSVGElement;
 
 namespace mozilla {

content/svg/content/src/SVGAnimatedLengthList.h

@@ -37,12 +37,14 @@
 #ifndef MOZILLA_SVGANIMATEDLENGTHLIST_H__
 #define MOZILLA_SVGANIMATEDLENGTHLIST_H__
 
+#include "nsAutoPtr.h"
+#include "nsISMILAttr.h"
 #include "SVGLengthList.h"
 
+class nsISMILAnimationElement;
+class nsSMILValue;
 class nsSVGElement;
 
-#include "nsISMILAttr.h"
-
 namespace mozilla {
 
 /**

content/svg/content/src/SVGAnimatedNumberList.h

@@ -37,12 +37,14 @@
 #ifndef MOZILLA_SVGANIMATEDNUMBERLIST_H__
 #define MOZILLA_SVGANIMATEDNUMBERLIST_H__
 
+#include "nsAutoPtr.h"
+#include "nsISMILAttr.h"
 #include "SVGNumberList.h"
 
+class nsISMILAnimationElement;
+class nsSMILValue;
 class nsSVGElement;
 
-#include "nsISMILAttr.h"
-
 namespace mozilla {
 
 /**

content/svg/content/src/SVGAnimatedPathSegList.h

@@ -37,12 +37,14 @@
 #ifndef MOZILLA_SVGANIMATEDPATHSEGLIST_H__
 #define MOZILLA_SVGANIMATEDPATHSEGLIST_H__
 
+#include "nsAutoPtr.h"
+#include "nsISMILAttr.h"
 #include "SVGPathData.h"
 
+class nsISMILAnimationElement;
+class nsSMILValue;
 class nsSVGElement;
 
-#include "nsISMILAttr.h"
-
 namespace mozilla {
 
 /**

content/svg/content/src/SVGAnimatedPointList.h

@@ -37,12 +37,14 @@
 #ifndef MOZILLA_SVGANIMATEDPOINTLIST_H__
 #define MOZILLA_SVGANIMATEDPOINTLIST_H__
 
+#include "nsAutoPtr.h"
+#include "nsISMILAttr.h"
 #include "SVGPointList.h"
 
+class nsISMILAnimationElement;
+class nsSMILValue;
 class nsSVGElement;
 
-#include "nsISMILAttr.h"
-
 namespace mozilla {
 
 /**

content/svg/content/src/SVGAnimatedPreserveAspectRatio.h

@@ -39,10 +39,17 @@
 #ifndef MOZILLA_SVGANIMATEDPRESERVEASPECTRATIO_H__
 #define MOZILLA_SVGANIMATEDPRESERVEASPECTRATIO_H__
 
-#include "nsIDOMSVGPresAspectRatio.h"
-#include "nsIDOMSVGAnimPresAspRatio.h"
-#include "nsSVGElement.h"
+#include "nsAutoPtr.h"
+#include "nsCycleCollectionParticipant.h"
 #include "nsDOMError.h"
+#include "nsError.h"
+#include "nsIDOMSVGAnimPresAspRatio.h"
+#include "nsIDOMSVGPresAspectRatio.h"
+#include "nsISMILAttr.h"
+#include "nsSVGElement.h"
+
+class nsISMILAnimationElement;
+class nsSMILValue;
 
 namespace mozilla {
 

content/svg/content/src/SVGAnimatedTransformList.h

@@ -39,12 +39,15 @@
 #ifndef MOZILLA_SVGANIMATEDTRANSFORMLIST_H__
 #define MOZILLA_SVGANIMATEDTRANSFORMLIST_H__
 
+#include "nsAutoPtr.h"
+#include "nsISMILAttr.h"
 #include "SVGTransformList.h"
 
+class nsIAtom;
+class nsISMILAnimationElement;
+class nsSMILValue;
 class nsSVGElement;
 
-#include "nsISMILAttr.h"
-
 namespace mozilla {
 
 /**

content/svg/content/src/SVGIntegerPairSMILType.h

@@ -39,6 +39,8 @@
 
 #include "nsISMILType.h"
 
+class nsSMILValue;
+
 namespace mozilla {
 
 class SVGIntegerPairSMILType : public nsISMILType

content/svg/content/src/SVGLength.h

@@ -37,9 +37,8 @@
 #ifndef MOZILLA_SVGLENGTH_H__
 #define MOZILLA_SVGLENGTH_H__
 
+#include "nsDebug.h"
 #include "nsIDOMSVGLength.h"
-#include "nsIContent.h"
-#include "nsAString.h"
 #include "nsMathUtils.h"
 
 class nsSVGElement;

content/svg/content/src/SVGLengthList.h

@@ -37,10 +37,14 @@
 #ifndef MOZILLA_SVGLENGTHLIST_H__
 #define MOZILLA_SVGLENGTHLIST_H__
 
-#include "SVGLength.h"
-#include "nsTArray.h"
-#include "nsSVGElement.h"
+#include "nsCOMPtr.h"
+#include "nsDebug.h"
+#include "nsIContent.h"
+#include "nsINode.h"
 #include "nsIWeakReferenceUtils.h"
+#include "nsSVGElement.h"
+#include "nsTArray.h"
+#include "SVGLength.h"
 
 namespace mozilla {
 

content/svg/content/src/SVGMotionSMILAnimationFunction.h

@@ -38,10 +38,17 @@
 #ifndef MOZILLA_SVGMOTIONSMILANIMATIONFUNCTION_H_
 #define MOZILLA_SVGMOTIONSMILANIMATIONFUNCTION_H_
 
-#include "nsSMILAnimationFunction.h"
-#include "SVGMotionSMILType.h" // for RotateType
 #include "gfxPath.h"  // for gfxFlattenedPath
+#include "nsAutoPtr.h"
+#include "nsSMILAnimationFunction.h"
+#include "nsTArray.h"
+#include "SVGMotionSMILType.h"  // for RotateType
 
+class nsAttrValue;
+class nsIAtom;
+class nsIContent;
+class nsISMILAttr;
+class nsSMILValue;
 class nsSVGMpathElement;
 
 namespace mozilla {

content/svg/content/src/SVGMotionSMILAttr.h

@@ -41,6 +41,10 @@
 #define MOZILLA_SVGMOTIONSMILATTR_H_
 
 #include "nsISMILAttr.h"
+
+class nsIContent;
+class nsISMILAnimationElement;
+class nsSMILValue;
 class nsSVGElement;
 
 namespace mozilla {

content/svg/content/src/SVGMotionSMILPathUtils.cpp

@@ -41,6 +41,7 @@
 #include "nsContentCreatorFunctions.h" // For NS_NewSVGElement
 #include "nsCharSeparatedTokenizer.h"
 #include "nsContentUtils.h"
+#include "nsSVGUtils.h"
 
 namespace mozilla {
 

content/svg/content/src/SVGMotionSMILPathUtils.h

@@ -41,18 +41,16 @@
 #ifndef MOZILLA_SVGMOTIONSMILPATHUTILS_H_
 #define MOZILLA_SVGMOTIONSMILPATHUTILS_H_
 
-#include "nsSMILParserUtils.h"
-#include "nsAutoPtr.h"
-#include "nsTArray.h"
-#include "nsDebug.h"
 #include "gfxContext.h"
-#include "nsSVGUtils.h"
 #include "gfxPlatform.h"
+#include "nsCOMPtr.h"
+#include "nsDebug.h"
+#include "nsSMILParserUtils.h"
+#include "nsTArray.h"
 
-class nsSVGElement;
-class nsIContent;
-class nsIDocument;
+class gfxFlattenedPath;
 class nsAString;
+class nsSVGElement;
 
 namespace mozilla {
 

content/svg/content/src/SVGMotionSMILType.h

@@ -40,12 +40,11 @@
 #ifndef MOZILLA_SVGMOTIONSMILTYPE_H_
 #define MOZILLA_SVGMOTIONSMILTYPE_H_
 
-#include "nsISMILType.h"
 #include "gfxMatrix.h"
-#include "nsTArray.h"
-class nsSVGPathElement;
-class nsSMILValue;
+#include "nsISMILType.h"
+
 class gfxFlattenedPath;
+class nsSMILValue;
 
 namespace mozilla {
 

content/svg/content/src/SVGNumberList.h

@@ -37,8 +37,13 @@
 #ifndef MOZILLA_SVGNUMBERLIST_H__
 #define MOZILLA_SVGNUMBERLIST_H__
 
-#include "nsTArray.h"
+#include "nsCOMPtr.h"
+#include "nsDebug.h"
+#include "nsIContent.h"
+#include "nsINode.h"
+#include "nsIWeakReferenceUtils.h"
 #include "nsSVGElement.h"
+#include "nsTArray.h"
 
 namespace mozilla {
 

content/svg/content/src/SVGNumberPairSMILType.h

@@ -39,6 +39,8 @@
 
 #include "nsISMILType.h"
 
+class nsSMILValue;
+
 namespace mozilla {
 
 class SVGNumberPairSMILType : public nsISMILType

content/svg/content/src/SVGOrientSMILType.h

@@ -39,6 +39,8 @@
 
 #include "nsISMILType.h"
 
+class nsSMILValue;
+
 /**
  * This nsISMILType class is a special case for the 'orient' attribute on SVG's
  * 'marker' element.

content/svg/content/src/SVGPathData.h

@@ -37,15 +37,21 @@
 #ifndef MOZILLA_SVGPATHDATA_H__
 #define MOZILLA_SVGPATHDATA_H__
 
-#include "SVGPathSegUtils.h"
-#include "nsTArray.h"
-#include "nsSVGElement.h"
+#include "nsCOMPtr.h"
+#include "nsDebug.h"
+#include "nsIContent.h"
+#include "nsINode.h"
 #include "nsIWeakReferenceUtils.h"
+#include "nsSVGElement.h"
+#include "nsTArray.h"
+
+#include <string.h>
 
 class gfxContext;
-struct gfxMatrix;
 class gfxFlattenedPath;
-class nsSVGPathDataParserToInternal;
+class nsSVGPathDataParserToInternal; // IWYU pragma: keep
+
+struct gfxMatrix;
 struct nsSVGMark;
 
 namespace mozilla {

content/svg/content/src/SVGPathSegListSMILType.cpp

@@ -36,6 +36,7 @@
 
 #include "SVGPathSegListSMILType.h"
 #include "nsSMILValue.h"
+#include "SVGPathSegUtils.h"
 #include "SVGPathData.h"
 #include "mozilla/Util.h"
 #include <math.h>

content/svg/content/src/SVGPathSegUtils.h

@@ -37,11 +37,10 @@
 #ifndef MOZILLA_SVGPATHSEGUTILS_H__
 #define MOZILLA_SVGPATHSEGUTILS_H__
 
-#include "nsIDOMSVGPathSeg.h"
-#include "nsIContent.h"
-#include "nsAString.h"
-#include "nsContentUtils.h"
 #include "gfxPoint.h"
+#include "nsDebug.h"
+#include "nsIDOMSVGPathSeg.h"
+#include "nsMemory.h"
 
 #define NS_SVG_PATH_SEG_MAX_ARGS         7
 #define NS_SVG_PATH_SEG_FIRST_VALID_TYPE nsIDOMSVGPathSeg::PATHSEG_CLOSEPATH

content/svg/content/src/SVGPoint.h

@@ -39,7 +39,6 @@
 
 #include "nsDebug.h"
 #include "gfxPoint.h"
-#include "nsMathUtils.h"
 
 namespace mozilla {
 

content/svg/content/src/SVGPointList.h

@@ -37,10 +37,16 @@
 #ifndef MOZILLA_SVGPOINTLIST_H__
 #define MOZILLA_SVGPOINTLIST_H__
 
-#include "SVGPoint.h"
-#include "nsTArray.h"
-#include "nsSVGElement.h"
+#include "nsCOMPtr.h"
+#include "nsDebug.h"
+#include "nsIContent.h"
+#include "nsINode.h"
 #include "nsIWeakReferenceUtils.h"
+#include "nsSVGElement.h"
+#include "nsTArray.h"
+#include "SVGPoint.h"
+
+#include <string.h>
 
 namespace mozilla {
 

content/svg/content/src/SVGStringList.h

@@ -38,8 +38,9 @@
 #ifndef MOZILLA_SVGSTRINGLIST_H__
 #define MOZILLA_SVGSTRINGLIST_H__
 
+#include "nsDebug.h"
 #include "nsTArray.h"
-#include "nsSVGElement.h"
+#include "nsString.h" // IWYU pragma: keep
 
 namespace mozilla {
 

content/svg/content/src/SVGTransform.h

@@ -40,6 +40,7 @@
 #define MOZILLA_SVGTRANSFORM_H__
 
 #include "gfxMatrix.h"
+#include "nsDebug.h"
 #include "nsIDOMSVGTransform.h"
 
 namespace mozilla {

content/svg/content/src/SVGTransformList.cpp

@@ -38,6 +38,8 @@
 
 #include "SVGTransformList.h"
 #include "SVGTransformListParser.h"
+#include "nsString.h"
+#include "nsDOMError.h"
 
 namespace mozilla {
 

content/svg/content/src/SVGTransformList.h

@@ -39,9 +39,10 @@
 #ifndef MOZILLA_SVGTRANSFORMLIST_H__
 #define MOZILLA_SVGTRANSFORMLIST_H__
 
-#include "SVGTransform.h"
+#include "gfxMatrix.h"
+#include "nsDebug.h"
 #include "nsTArray.h"
-#include "nsSVGElement.h"
+#include "SVGTransform.h"
 
 namespace mozilla {
 

content/svg/content/src/SVGViewBoxSMILType.h

@@ -39,6 +39,8 @@
 
 #include "nsISMILType.h"
 
+class nsSMILValue;
+
 namespace mozilla {
 
 class SVGViewBoxSMILType : public nsISMILType

content/svg/content/src/nsDOMSVGEvent.h

@@ -38,8 +38,11 @@
 #ifndef __NS_SVGEVENT_H__
 #define __NS_SVGEVENT_H__
 
-#include "nsIDOMSVGEvent.h"
 #include "nsDOMEvent.h"
+#include "nsIDOMSVGEvent.h"
+
+class nsEvent;
+class nsPresContext;
 
 class nsDOMSVGEvent : public nsDOMEvent,
                       public nsIDOMSVGEvent

content/svg/content/src/nsDOMSVGZoomEvent.h

@@ -38,9 +38,12 @@
 #ifndef __NS_SVGZOOMEVENT_H__
 #define __NS_SVGZOOMEVENT_H__
 
-#include "nsIDOMSVGZoomEvent.h"
+#include "nsAutoPtr.h"
 #include "nsDOMUIEvent.h"
-#include "nsIDOMSVGSVGElement.h"
+#include "nsIDOMSVGZoomEvent.h"
+
+class nsGUIEvent;
+class nsPresContext;
 
 namespace mozilla {
 class DOMSVGPoint;

content/svg/content/src/nsSVGAElement.h

@@ -38,14 +38,13 @@
 #ifndef NS_SVGAELEMENT_H_
 #define NS_SVGAELEMENT_H_
 
-#include "nsSVGGraphicElement.h"
+#include "DOMSVGTests.h"
+#include "Link.h"
 #include "nsIDOMSVGAElement.h"
 #include "nsIDOMSVGURIReference.h"
 #include "nsILink.h"
+#include "nsSVGGraphicElement.h"
 #include "nsSVGString.h"
-#include "DOMSVGTests.h"
-
-#include "Link.h"
 
 typedef nsSVGGraphicElement nsSVGAElementBase;
 

content/svg/content/src/nsSVGAngle.h

@@ -37,11 +37,17 @@
 #ifndef __NS_SVGANGLE_H__
 #define __NS_SVGANGLE_H__
 
+#include "nsAutoPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsDOMError.h"
+#include "nsError.h"
 #include "nsIDOMSVGAngle.h"
 #include "nsIDOMSVGAnimatedAngle.h"
+#include "nsISMILAttr.h"
 #include "nsSVGElement.h"
-#include "nsDOMError.h"
 
+class nsISMILAnimationElement;
+class nsSMILValue;
 class nsSVGOrientType;
 
 class nsSVGAngle

content/svg/content/src/nsSVGAnimateMotionElement.h

@@ -38,8 +38,8 @@
 #ifndef NS_SVGANIMATEMOTIONELEMENT_H_
 #define NS_SVGANIMATEMOTIONELEMENT_H_
 
-#include "nsSVGAnimationElement.h"
 #include "nsIDOMSVGAnimateMotionElement.h"
+#include "nsSVGAnimationElement.h"
 #include "nsSVGEnum.h"
 #include "SVGMotionSMILAnimationFunction.h"
 

content/svg/content/src/nsSVGAnimationElement.h

@@ -39,14 +39,13 @@
 #ifndef NS_SVGANIMATIONELEMENT_H_
 #define NS_SVGANIMATIONELEMENT_H_
 
-#include "nsSVGElement.h"
-#include "nsAutoPtr.h"
-#include "nsReferencedElement.h"
-#include "nsIDOMSVGAnimationElement.h"
 #include "DOMSVGTests.h"
 #include "nsIDOMElementTimeControl.h"
+#include "nsIDOMSVGAnimationElement.h"
 #include "nsISMILAnimationElement.h"
+#include "nsReferencedElement.h"
 #include "nsSMILTimedElement.h"
+#include "nsSVGElement.h"
 
 typedef nsSVGElement nsSVGAnimationElementBase;
 

content/svg/content/src/nsSVGAttrTearoffTable.h

@@ -35,6 +35,8 @@
 #define NS_SVGATTRTEAROFFTABLE_H_
 
 #include "nsDataHashtable.h"
+#include "nsDebug.h"
+#include "nsHashKeys.h"
 
 /**
  * Global hashmap to associate internal SVG data types (e.g. nsSVGLength2) with

content/svg/content/src/nsSVGBoolean.h

@@ -37,9 +37,16 @@
 #ifndef __NS_SVGBOOLEAN_H__
 #define __NS_SVGBOOLEAN_H__
 
+#include "nsAutoPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsError.h"
 #include "nsIDOMSVGAnimatedBoolean.h"
+#include "nsISMILAttr.h"
+#include "nsISupportsImpl.h"
 #include "nsSVGElement.h"
-#include "nsDOMError.h"
+
+class nsISMILAnimationElement;
+class nsSMILValue;
 
 class nsSVGBoolean
 {

content/svg/content/src/nsSVGClass.h

@@ -37,13 +37,12 @@
 #ifndef __NS_SVGCLASS_H__
 #define __NS_SVGCLASS_H__
 
-#include "nsIDOMSVGAnimatedString.h"
 #include "nsAutoPtr.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsString.h"
 #include "nsDOMError.h"
-
+#include "nsIDOMSVGAnimatedString.h"
 #include "nsISMILAttr.h"
+#include "nsString.h"
 
 class nsSVGStylableElement;
 

content/svg/content/src/nsSVGClipPathElement.h

@@ -37,11 +37,11 @@
 #ifndef __NS_SVGCLIPPATHELEMENT_H__
 #define __NS_SVGCLIPPATHELEMENT_H__
 
-#include "nsSVGGraphicElement.h"
+#include "DOMSVGTests.h"
 #include "nsIDOMSVGClipPathElement.h"
 #include "nsIDOMSVGUnitTypes.h"
-#include "DOMSVGTests.h"
 #include "nsSVGEnum.h"
+#include "nsSVGGraphicElement.h"
 
 typedef nsSVGGraphicElement nsSVGClipPathElementBase;
 

content/svg/content/src/nsSVGDataParser.h

@@ -38,7 +38,9 @@
 #ifndef __NS_SVGDATAPARSER_H__
 #define __NS_SVGDATAPARSER_H__
 
-#include "nsCOMPtr.h"
+#include "nsError.h"
+
+class nsAString;
 
 //----------------------------------------------------------------------
 // helper macros

content/svg/content/src/nsSVGElement.cpp

@@ -36,9 +36,10 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "nsSVGElement.h"
+
 #include "mozilla/Util.h"
 
-#include "nsSVGElement.h"
 #include "nsSVGSVGElement.h"
 #include "nsIDocument.h"
 #include "nsRange.h"

content/svg/content/src/nsSVGElement.h

@@ -44,29 +44,31 @@
   It implements all the common DOM interfaces and handles attributes.
 */
 
-#include "nsString.h"
-#include "nsCOMPtr.h"
-#include "nsIDOMSVGElement.h"
-#include "nsGenericElement.h"
-#include "nsStyledElement.h"
 #include "mozilla/css/StyleRule.h"
+#include "nsAutoPtr.h"
+#include "nsChangeHint.h"
+#include "nsCOMPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsDOMMemoryReporter.h"
+#include "nsError.h"
+#include "nsGenericElement.h"
+#include "nsISupportsImpl.h"
+#include "nsStyledElement.h"
 
-#include "nsISMILAttr.h"
-#include "nsSMILAnimationController.h"
-
-class nsSVGSVGElement;
-class nsSVGLength2;
-class nsSVGNumber2;
-class nsSVGNumberPair;
-class nsSVGInteger;
-class nsSVGIntegerPair;
+class nsIDOMSVGElement;
+class nsIDOMSVGSVGElement;
 class nsSVGAngle;
 class nsSVGBoolean;
 class nsSVGEnum;
-struct nsSVGEnumMapping;
-class nsSVGViewBox;
+class nsSVGInteger;
+class nsSVGIntegerPair;
+class nsSVGLength2;
+class nsSVGNumber2;
+class nsSVGNumberPair;
 class nsSVGString;
-struct gfxMatrix;
+class nsSVGSVGElement;
+class nsSVGViewBox;
+
 namespace mozilla {
 class SVGAnimatedNumberList;
 class SVGNumberList;
@@ -80,6 +82,9 @@ class SVGStringList;
 class DOMSVGStringList;
 }
 
+struct gfxMatrix;
+struct nsSVGEnumMapping;
+
 typedef nsStyledElementNotElementCSSInlineStyle nsSVGElementBase;
 
 class nsSVGElement : public nsSVGElementBase    // nsIContent

content/svg/content/src/nsSVGEnum.h

@@ -37,9 +37,16 @@
 #ifndef __NS_SVGENUM_H__
 #define __NS_SVGENUM_H__
 
+#include "nsAutoPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsError.h"
 #include "nsIDOMSVGAnimatedEnum.h"
+#include "nsISMILAttr.h"
 #include "nsSVGElement.h"
-#include "nsDOMError.h"
+
+class nsIAtom;
+class nsISMILAnimationElement;
+class nsSMILValue;
 
 typedef PRUint8 nsSVGEnumValue;
 

content/svg/content/src/nsSVGFilterElement.h

@@ -37,14 +37,14 @@
 #ifndef __NS_SVGFILTERELEMENT_H__
 #define __NS_SVGFILTERELEMENT_H__
 
-#include "nsSVGGraphicElement.h"
-#include "nsIDOMSVGFilterElement.h"
-#include "nsIDOMSVGURIReference.h"
-#include "nsIDOMSVGUnitTypes.h"
 #include "DOMSVGTests.h"
-#include "nsSVGLength2.h"
-#include "nsSVGIntegerPair.h"
+#include "nsIDOMSVGFilterElement.h"
+#include "nsIDOMSVGUnitTypes.h"
+#include "nsIDOMSVGURIReference.h"
 #include "nsSVGEnum.h"
+#include "nsSVGGraphicElement.h"
+#include "nsSVGIntegerPair.h"
+#include "nsSVGLength2.h"
 #include "nsSVGString.h"
 
 typedef nsSVGGraphicElement nsSVGFilterElementBase;

content/svg/content/src/nsSVGFilters.h

@@ -37,20 +37,20 @@
 #ifndef __NS_SVGFILTERSELEMENT_H__
 #define __NS_SVGFILTERSELEMENT_H__
 
-#include "nsSVGStylableElement.h"
+#include "gfxImageSurface.h"
+#include "gfxRect.h"
+#include "nsIDOMSVGFilters.h"
+#include "nsIDOMSVGURIReference.h"
+#include "nsIFrame.h"
+#include "nsImageLoadingContent.h"
 #include "nsSVGLength2.h"
 #include "nsSVGString.h"
-#include "nsIFrame.h"
-#include "gfxRect.h"
-#include "gfxImageSurface.h"
-#include "nsIDOMSVGFilters.h"
-#include "nsImageLoadingContent.h"
-#include "nsIDOMSVGURIReference.h"
+#include "nsSVGStylableElement.h"
 #include "SVGAnimatedPreserveAspectRatio.h"
 
+class nsSVGFilterInstance;
 class nsSVGFilterResource;
 class nsSVGNumberPair;
-class nsSVGFilterInstance;
 
 struct nsSVGStringInfo {
   nsSVGStringInfo(const nsSVGString* aString,

content/svg/content/src/nsSVGForeignObjectElement.h

@@ -39,9 +39,9 @@
 #ifndef __NS_SVGFOREIGNOBJECTELEMENT_H__
 #define __NS_SVGFOREIGNOBJECTELEMENT_H__
 
-#include "nsSVGGraphicElement.h"
-#include "nsIDOMSVGForeignObjectElem.h"
 #include "DOMSVGTests.h"
+#include "nsIDOMSVGForeignObjectElem.h"
+#include "nsSVGGraphicElement.h"
 #include "nsSVGLength2.h"
 
 typedef nsSVGGraphicElement nsSVGForeignObjectElementBase;

content/svg/content/src/nsSVGGraphicElement.h

@@ -39,11 +39,11 @@
 #ifndef __NS_SVGGRAPHICELEMENT_H__
 #define __NS_SVGGRAPHICELEMENT_H__
 
-#include "nsSVGStylableElement.h"
+#include "gfxMatrix.h"
 #include "nsIDOMSVGLocatable.h"
 #include "nsIDOMSVGTransformable.h"
+#include "nsSVGStylableElement.h"
 #include "SVGAnimatedTransformList.h"
-#include "gfxMatrix.h"
 
 typedef nsSVGStylableElement nsSVGGraphicElementBase;
 

content/svg/content/src/nsSVGImageElement.h

@@ -39,12 +39,12 @@
 #ifndef __NS_SVGIMAGEELEMENT_H__
 #define __NS_SVGIMAGEELEMENT_H__
 
-#include "nsSVGPathGeometryElement.h"
 #include "nsIDOMSVGImageElement.h"
 #include "nsIDOMSVGURIReference.h"
 #include "nsImageLoadingContent.h"
-#include "nsSVGString.h"
 #include "nsSVGLength2.h"
+#include "nsSVGPathGeometryElement.h"
+#include "nsSVGString.h"
 #include "SVGAnimatedPreserveAspectRatio.h"
 
 typedef nsSVGPathGeometryElement nsSVGImageElementBase;

content/svg/content/src/nsSVGInteger.h

@@ -37,9 +37,15 @@
 #ifndef __NS_SVGINTEGER_H__
 #define __NS_SVGINTEGER_H__
 
+#include "nsAutoPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsError.h"
 #include "nsIDOMSVGAnimatedInteger.h"
+#include "nsISMILAttr.h"
 #include "nsSVGElement.h"
-#include "nsDOMError.h"
+
+class nsISMILAnimationElement;
+class nsSMILValue;
 
 class nsSVGInteger
 {

content/svg/content/src/nsSVGIntegerPair.h

@@ -37,13 +37,15 @@
 #ifndef __NS_SVGINTEGERPAIR_H__
 #define __NS_SVGINTEGERPAIR_H__
 
+#include "nsAutoPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsError.h"
 #include "nsIDOMSVGAnimatedInteger.h"
-#include "nsSVGElement.h"
-#include "nsDOMError.h"
-
 #include "nsISMILAttr.h"
+#include "nsSVGElement.h"
+
+class nsISMILAnimationElement;
 class nsSMILValue;
-class nsISMILType;
 
 class nsSVGIntegerPair
 {

content/svg/content/src/nsSVGLength2.h

@@ -37,18 +37,22 @@
 #ifndef __NS_SVGLENGTH2_H__
 #define __NS_SVGLENGTH2_H__
 
-#include "nsIDOMSVGLength.h"
-#include "nsIDOMSVGAnimatedLength.h"
-#include "nsSVGUtils.h"
-#include "nsSVGElement.h"
+#include "nsAutoPtr.h"
+#include "nsCoord.h"
+#include "nsCycleCollectionParticipant.h"
 #include "nsDOMError.h"
-#include "nsMathUtils.h"
-
+#include "nsError.h"
+#include "nsIDOMSVGAnimatedLength.h"
+#include "nsIDOMSVGLength.h"
 #include "nsISMILAttr.h"
-class nsSMILValue;
-class nsISMILType;
+#include "nsMathUtils.h"
+#include "nsSVGElement.h"
+#include "nsSVGUtils.h"
 
 class nsIFrame;
+class nsISMILAnimationElement;
+class nsSMILValue;
+class nsSVGSVGElement;
 
 class nsSVGLength2
 {

content/svg/content/src/nsSVGMarkerElement.h

@@ -37,15 +37,15 @@
 #ifndef __NS_SVGMARKERELEMENT_H__
 #define __NS_SVGMARKERELEMENT_H__
 
-#include "nsSVGGraphicElement.h"
-#include "nsIDOMSVGMarkerElement.h"
+#include "gfxMatrix.h"
 #include "nsIDOMSVGFitToViewBox.h"
-#include "nsSVGLength2.h"
-#include "nsSVGEnum.h"
+#include "nsIDOMSVGMarkerElement.h"
 #include "nsSVGAngle.h"
+#include "nsSVGEnum.h"
+#include "nsSVGGraphicElement.h"
+#include "nsSVGLength2.h"
 #include "nsSVGViewBox.h"
 #include "SVGAnimatedPreserveAspectRatio.h"
-#include "gfxMatrix.h"
 
 class nsSVGOrientType
 {

content/svg/content/src/nsSVGMaskElement.h

@@ -37,12 +37,12 @@
 #ifndef __NS_SVGMASKELEMENT_H__
 #define __NS_SVGMASKELEMENT_H__
 
-#include "nsSVGStylableElement.h"
-#include "nsIDOMSVGMaskElement.h"
 #include "DOMSVGTests.h"
+#include "nsIDOMSVGMaskElement.h"
 #include "nsIDOMSVGUnitTypes.h"
-#include "nsSVGLength2.h"
 #include "nsSVGEnum.h"
+#include "nsSVGLength2.h"
+#include "nsSVGStylableElement.h"
 
 //--------------------- Masks ------------------------
 

content/svg/content/src/nsSVGMpathElement.cpp

@@ -42,6 +42,7 @@
 #include "nsDebug.h"
 #include "nsSVGPathElement.h"
 #include "nsSVGAnimateMotionElement.h"
+#include "nsContentUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

content/svg/content/src/nsSVGNumber2.cpp

@@ -42,6 +42,7 @@
 #include "nsContentUtils.h" // NS_ENSURE_FINITE
 #include "nsSMILValue.h"
 #include "nsSMILFloatType.h"
+#include "nsIDOMSVGNumber.h"
 
 class DOMSVGNumber : public nsIDOMSVGNumber
 {

content/svg/content/src/nsSVGNumber2.h

@@ -37,15 +37,16 @@
 #ifndef __NS_SVGNUMBER2_H__
 #define __NS_SVGNUMBER2_H__
 
-#include "nsIDOMSVGNumber.h"
+#include "nsAutoPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsError.h"
 #include "nsIDOMSVGAnimatedNumber.h"
-#include "nsSVGElement.h"
-#include "nsDOMError.h"
-#include "nsMathUtils.h"
-
 #include "nsISMILAttr.h"
+#include "nsMathUtils.h"
+#include "nsSVGElement.h"
+
+class nsISMILAnimationElement;
 class nsSMILValue;
-class nsISMILType;
 
 class nsSVGNumber2
 {

content/svg/content/src/nsSVGNumberPair.h

@@ -37,15 +37,16 @@
 #ifndef __NS_SVGNUMBERPAIR_H__
 #define __NS_SVGNUMBERPAIR_H__
 
-#include "nsIDOMSVGNumber.h"
+#include "nsAutoPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsError.h"
 #include "nsIDOMSVGAnimatedNumber.h"
-#include "nsSVGElement.h"
-#include "nsDOMError.h"
-#include "nsMathUtils.h"
-
 #include "nsISMILAttr.h"
+#include "nsMathUtils.h"
+#include "nsSVGElement.h"
+
+class nsISMILAnimationElement;
 class nsSMILValue;
-class nsISMILType;
 
 class nsSVGNumberPair
 {

content/svg/content/src/nsSVGPathDataParser.cpp

@@ -41,6 +41,7 @@
 #include "nsSVGPathElement.h"
 #include "prdtoa.h"
 #include "nsSVGUtils.h"
+#include "nsIDOMSVGPathSeg.h"
 #include <stdlib.h>
 #include <math.h>
 

content/svg/content/src/nsSVGPathDataParser.h

@@ -39,14 +39,8 @@
 #ifndef __NS_SVGPATHDATAPARSER_H__
 #define __NS_SVGPATHDATAPARSER_H__
 
-#include "nsSVGDataParser.h"
-#include "nsCOMPtr.h"
-#include "nsCOMArray.h"
-#include "nsIDOMSVGPathSeg.h"
-#include "nsTArray.h"
 #include "gfxPoint.h"
-
-class nsSVGPathList;
+#include "nsSVGDataParser.h"
 
 namespace mozilla {
 class SVGPathData;

content/svg/content/src/nsSVGPathElement.cpp

@@ -44,6 +44,7 @@
 #include "DOMSVGPathSegList.h"
 #include "nsCOMPtr.h"
 #include "nsIFrame.h"
+#include "nsContentUtils.h"
 #include "nsSVGPathDataParser.h"
 #include "nsSVGPathElement.h"
 #include "nsSVGUtils.h"

content/svg/content/src/nsSVGPathElement.h

@@ -39,12 +39,11 @@
 #ifndef __NS_SVGPATHELEMENT_H__
 #define __NS_SVGPATHELEMENT_H__
 
-#include "nsSVGPathGeometryElement.h"
-#include "nsIDOMSVGPathElement.h"
 #include "nsIDOMSVGAnimatedPathData.h"
+#include "nsIDOMSVGPathElement.h"
 #include "nsSVGNumber2.h"
+#include "nsSVGPathGeometryElement.h"
 #include "SVGAnimatedPathSegList.h"
-#include "gfxPath.h"
 
 class gfxContext;
 

content/svg/content/src/nsSVGPathGeometryElement.h

@@ -37,11 +37,10 @@
 #ifndef __NS_SVGPATHGEOMETRYELEMENT_H__
 #define __NS_SVGPATHGEOMETRYELEMENT_H__
 
-#include "nsSVGGraphicElement.h"
 #include "DOMSVGTests.h"
-#include "nsTArray.h"
-#include "gfxPath.h"
 #include "gfxMatrix.h"
+#include "nsSVGGraphicElement.h"
+#include "nsTArray.h"
 
 struct nsSVGMark {
   float x, y, angle;

content/svg/content/src/nsSVGPatternElement.h

@@ -39,15 +39,15 @@
 #ifndef __NS_SVGPATTERNELEMENT_H__
 #define __NS_SVGPATTERNELEMENT_H__
 
-#include "nsSVGStylableElement.h"
-#include "nsIDOMSVGURIReference.h"
+#include "DOMSVGTests.h"
 #include "nsIDOMSVGFitToViewBox.h"
 #include "nsIDOMSVGPatternElement.h"
-#include "DOMSVGTests.h"
 #include "nsIDOMSVGUnitTypes.h"
-#include "nsSVGLength2.h"
+#include "nsIDOMSVGURIReference.h"
 #include "nsSVGEnum.h"
+#include "nsSVGLength2.h"
 #include "nsSVGString.h"
+#include "nsSVGStylableElement.h"
 #include "nsSVGViewBox.h"
 #include "SVGAnimatedPreserveAspectRatio.h"
 #include "SVGAnimatedTransformList.h"

content/svg/content/src/nsSVGPolyElement.h

@@ -37,8 +37,8 @@
 #ifndef NS_SVGPOLYELEMENT_H_
 #define NS_SVGPOLYELEMENT_H_
 
-#include "nsSVGPathGeometryElement.h"
 #include "nsIDOMSVGAnimatedPoints.h"
+#include "nsSVGPathGeometryElement.h"
 #include "SVGAnimatedPointList.h"
 
 typedef nsSVGPathGeometryElement nsSVGPolyElementBase;

content/svg/content/src/nsSVGRect.h

@@ -40,8 +40,8 @@
 #ifndef __NS_SVGRECT_H__
 #define __NS_SVGRECT_H__
 
-#include "nsIDOMSVGRect.h"
 #include "gfxRect.h"
+#include "nsIDOMSVGRect.h"
 
 nsresult
 NS_NewSVGRect(nsIDOMSVGRect** result,

content/svg/content/src/nsSVGSVGElement.h

@@ -40,20 +40,20 @@
 #ifndef __NS_SVGSVGELEMENT_H__
 #define __NS_SVGSVGELEMENT_H__
 
-#include "nsSVGStylableElement.h"
-#include "nsIDOMSVGSVGElement.h"
 #include "DOMSVGTests.h"
+#include "mozilla/dom/FromParser.h"
 #include "nsIDOMSVGFitToViewBox.h"
 #include "nsIDOMSVGLocatable.h"
-#include "nsIDOMSVGZoomAndPan.h"
-#include "nsIDOMSVGMatrix.h"
 #include "nsIDOMSVGPoint.h"
-#include "nsSVGLength2.h"
+#include "nsIDOMSVGSVGElement.h"
+#include "nsIDOMSVGZoomAndPan.h"
 #include "nsSVGEnum.h"
+#include "nsSVGLength2.h"
+#include "nsSVGStylableElement.h"
 #include "nsSVGViewBox.h"
 #include "SVGAnimatedPreserveAspectRatio.h"
-#include "mozilla/dom/FromParser.h"
 
+class nsIDOMSVGMatrix;
 class nsSMILTimeContainer;
 
 typedef nsSVGStylableElement nsSVGSVGElementBase;

content/svg/content/src/nsSVGString.h

@@ -37,9 +37,9 @@
 #ifndef __NS_SVGSTRING_H__
 #define __NS_SVGSTRING_H__
 
+#include "nsDOMError.h"
 #include "nsIDOMSVGAnimatedString.h"
 #include "nsSVGElement.h"
-#include "nsDOMError.h"
 
 class nsSVGString
 {

content/svg/content/src/nsSVGStylableElement.h

@@ -39,10 +39,10 @@
 #ifndef __NS_SVGSTYLABLEELEMENT_H__
 #define __NS_SVGSTYLABLEELEMENT_H__
 
-#include "nsSVGElement.h"
+#include "nsAutoPtr.h"
 #include "nsIDOMSVGStylable.h"
 #include "nsSVGClass.h"
-#include "nsAutoPtr.h"
+#include "nsSVGElement.h"
 
 typedef nsSVGElement nsSVGStylableElementBase;
 

content/svg/content/src/nsSVGSwitchElement.h

@@ -39,9 +39,9 @@
 #ifndef __NS_SVGSWITCHELEMENT_H__
 #define __NS_SVGSWITCHELEMENT_H__
 
-#include "nsSVGGraphicElement.h"
-#include "nsIDOMSVGSwitchElement.h"
 #include "DOMSVGTests.h"
+#include "nsIDOMSVGSwitchElement.h"
+#include "nsSVGGraphicElement.h"
 
 typedef nsSVGGraphicElement nsSVGSwitchElementBase;
 

content/svg/content/src/nsSVGTextContentElement.h

@@ -39,10 +39,10 @@
 #ifndef __NS_SVGTEXTCONTENTELEMENTBASE_H__
 #define __NS_SVGTEXTCONTENTELEMENTBASE_H__
 
-#include "nsIDOMSVGTextContentElement.h"
-#include "nsSVGTextContainerFrame.h"
-#include "nsSVGStylableElement.h"
 #include "DOMSVGTests.h"
+#include "nsIDOMSVGTextContentElement.h"
+#include "nsSVGStylableElement.h"
+#include "nsSVGTextContainerFrame.h"
 
 typedef nsSVGStylableElement nsSVGTextContentElementBase;
 

content/svg/content/src/nsSVGTextPathElement.h

@@ -38,11 +38,23 @@
 #ifndef __NS_SVGTEXTPATHELEMENT_H__
 #define __NS_SVGTEXTPATHELEMENT_H__
 
+#include "nsIDOMElement.h"
+#include "nsIDOMNode.h"
+#include "nsIDOMSVGElement.h"
+#include "nsIDOMSVGTextContentElement.h"
+#include "nsIDOMSVGTextPathElement.h"
+#include "nsIDOMSVGURIReference.h"
 #include "nsSVGEnum.h"
 #include "nsSVGLength2.h"
 #include "nsSVGString.h"
 #include "nsSVGTextContentElement.h"
 
+class nsIAtom;
+class nsIContent;
+class nsINode;
+class nsINodeInfo;
+class nsXPCClassInfo;
+
 typedef nsSVGTextContentElement nsSVGTextPathElementBase;
 
 class nsSVGTextPathElement : public nsSVGTextPathElementBase, // = nsIDOMSVGTextContentElement

content/svg/content/src/nsSVGTextPositioningElement.h

@@ -38,8 +38,8 @@
 
 #include "nsIDOMSVGTextPositionElem.h"
 #include "nsSVGTextContentElement.h"
-#include "SVGAnimatedNumberList.h"
 #include "SVGAnimatedLengthList.h"
+#include "SVGAnimatedNumberList.h"
 
 class nsSVGElement;
 

content/svg/content/src/nsSVGUseElement.h

@@ -37,17 +37,16 @@
 #ifndef __NS_SVGUSEELEMENT_H__
 #define __NS_SVGUSEELEMENT_H__
 
-#include "nsIDOMSVGAnimatedString.h"
+#include "DOMSVGTests.h"
+#include "mozilla/dom/FromParser.h"
 #include "nsIDOMSVGURIReference.h"
 #include "nsIDOMSVGUseElement.h"
-#include "DOMSVGTests.h"
+#include "nsReferencedElement.h"
 #include "nsStubMutationObserver.h"
 #include "nsSVGGraphicElement.h"
 #include "nsSVGLength2.h"
 #include "nsSVGString.h"
 #include "nsTArray.h"
-#include "nsReferencedElement.h"
-#include "mozilla/dom/FromParser.h"
 
 class nsIContent;
 class nsINodeInfo;

content/svg/content/src/nsSVGViewBox.h

@@ -39,10 +39,17 @@
 #ifndef __NS_SVGVIEWBOX_H__
 #define __NS_SVGVIEWBOX_H__
 
-#include "nsIDOMSVGRect.h"
-#include "nsIDOMSVGAnimatedRect.h"
-#include "nsSVGElement.h"
+#include "nsAutoPtr.h"
+#include "nsCycleCollectionParticipant.h"
 #include "nsDOMError.h"
+#include "nsError.h"
+#include "nsIDOMSVGAnimatedRect.h"
+#include "nsIDOMSVGRect.h"
+#include "nsISMILAttr.h"
+#include "nsSVGElement.h"
+
+class nsISMILAnimationElement;
+class nsSMILValue;
 
 struct nsSVGViewBoxRect
 {