[Bug 847110] Fix up includes in layout/style r=dbaron

2024-11-26 06:11:37 +00:00 · 2013-03-02 19:31:48 -05:00 · 2013-03-02 19:31:48 -05:00 · 3250bd906e
commit 3250bd906e
parent f698145c72
65 changed files with 53 additions and 199 deletions
--- a/accessible/src/base/StyleInfo.cpp
+++ b/accessible/src/base/StyleInfo.cpp
@ -8,6 +8,7 @@

 #include "mozilla/dom/Element.h"
 #include "nsComputedDOMStyle.h"
+#include "nsCSSProps.h"
 #include "nsIFrame.h"

 using namespace mozilla;
--- a/content/smil/nsSMILCSSProperty.cpp
+++ b/content/smil/nsSMILCSSProperty.cpp
@ -9,6 +9,7 @@
 #include "nsSMILCSSValueType.h"
 #include "nsSMILValue.h"
 #include "nsComputedDOMStyle.h"
+#include "nsCSSProps.h"
 #include "nsStyleAnimation.h"
 #include "mozilla/dom/Element.h"
 #include "nsIDOMElement.h"
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@ -78,6 +78,7 @@
 #include "nsSVGOuterSVGFrame.h"
 #include "nsSVGTextFrame2.h"
 #include "nsStyleStructInlines.h"
+#include "nsStyleTransformMatrix.h"

 #include "mozilla/dom/PBrowserChild.h"
 #include "mozilla/dom/TabChild.h"
--- a/layout/generic/TextOverflow.cpp
+++ b/layout/generic/TextOverflow.cpp
@ -11,6 +11,7 @@
 #include "nsBlockFrame.h"
 #include "nsCaret.h"
 #include "nsContentUtils.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsGfxScrollFrame.h"
 #include "nsIScrollableFrame.h"
 #include "nsLayoutUtils.h"
--- a/layout/generic/nsFlexContainerFrame.cpp
+++ b/layout/generic/nsFlexContainerFrame.cpp
@ -9,6 +9,7 @@

 #include "nsFlexContainerFrame.h"
 #include "nsContentUtils.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsDisplayList.h"
 #include "nsLayoutUtils.h"
 #include "nsPresContext.h"
--- a/layout/style/AnimationCommon.cpp
+++ b/layout/style/AnimationCommon.cpp
@ -10,7 +10,6 @@
 #include "nsCSSValue.h"
 #include "nsStyleContext.h"
 #include "nsIFrame.h"
-#include "nsAnimationManager.h"
 #include "nsLayoutUtils.h"
 #include "mozilla/LookAndFeel.h"
 #include "Layers.h"
--- a/layout/style/CSS.cpp
+++ b/layout/style/CSS.cpp
@ -10,9 +10,7 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "nsCSSParser.h"
 #include "nsGlobalWindow.h"
-#include "nsIDOMDocument.h"
 #include "nsIDocument.h"
-#include "nsIPrincipal.h"
 #include "nsIURI.h"

 namespace mozilla {
--- a/layout/style/CSS.h
+++ b/layout/style/CSS.h
@ -9,10 +9,12 @@
 #define mozilla_dom_CSS_h_

 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Preferences.h"

 namespace mozilla {
+
+class ErrorResult;
+
 namespace dom {

 class GlobalObject;
--- a/layout/style/ErrorReporter.cpp
+++ b/layout/style/ErrorReporter.cpp
@ -15,8 +15,8 @@
 #include "nsIDocument.h"
 #include "nsIFactory.h"
 #include "nsIScriptError.h"
-#include "nsIServiceManager.h"
 #include "nsIStringBundle.h"
+#include "nsServiceManagerUtils.h"
 #include "nsStyleUtil.h"
 #include "nsThreadUtils.h"

--- a/layout/style/ImageLoader.h
+++ b/layout/style/ImageLoader.h
@ -5,10 +5,8 @@
 // A class that handles style system image loads (other image loads are handled
 // by the nodes in the content tree).

-#include "nsAutoPtr.h"
 #include "nsClassHashtable.h"
 #include "nsHashKeys.h"
-#include "nsInterfaceHashtable.h"
 #include "nsCSSValue.h"
 #include "imgIRequest.h"
 #include "imgIOnloadBlocker.h"
--- a/layout/style/Loader.cpp
+++ b/layout/style/Loader.cpp
@ -18,32 +18,25 @@

 #include "mozilla/Util.h"

-#include "mozilla/dom/Element.h"
 #include "mozilla/css/Loader.h"
 #include "nsIRunnable.h"
 #include "nsIUnicharStreamLoader.h"
 #include "nsSyncLoadService.h"
 #include "nsCOMPtr.h"
-#include "nsCOMArray.h"
 #include "nsString.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsIDOMNode.h"
 #include "nsIDOMDocument.h"
-#include "nsIDOMWindow.h"
-#include "nsHashtable.h"
 #include "nsIURI.h"
-#include "nsIServiceManager.h"
 #include "nsNetUtil.h"
 #include "nsContentUtils.h"
-#include "nsCRT.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsContentPolicyUtils.h"
 #include "nsIHttpChannel.h"
 #include "nsIHttpChannelInternal.h"
 #include "nsIScriptError.h"
 #include "nsMimeTypes.h"
-#include "nsIAtom.h"
 #include "nsCSSStyleSheet.h"
 #include "nsIStyleSheetLinkingElement.h"
 #include "nsICSSLoaderObserver.h"
@ -51,7 +44,6 @@
 #include "mozilla/css/ImportRule.h"
 #include "nsThreadUtils.h"
 #include "nsGkAtoms.h"
-#include "nsDocShellCID.h"
 #include "nsIThreadInternal.h"
 #include "nsCrossSiteListenerProxy.h"

@ -61,7 +53,6 @@

 #include "nsIMediaList.h"
 #include "nsIDOMStyleSheet.h"
-#include "nsIDOMCSSStyleSheet.h"
 #include "nsError.h"

 #include "nsIChannelPolicy.h"
--- a/layout/style/StyleRule.cpp
+++ b/layout/style/StyleRule.cpp
@ -13,25 +13,15 @@
 #include "mozilla/css/GroupRule.h"
 #include "mozilla/css/Declaration.h"
 #include "nsCSSStyleSheet.h"
-#include "mozilla/css/Loader.h"
-#include "nsIURL.h"
 #include "nsIDocument.h"
 #include "nsIAtom.h"
-#include "nsCRT.h"
 #include "nsString.h"
-#include "nsStyleConsts.h"
 #include "nsStyleUtil.h"
-#include "nsIDOMCSSStyleSheet.h"
 #include "nsICSSStyleRuleDOMWrapper.h"
-#include "nsIDOMCSSStyleDeclaration.h"
 #include "nsDOMCSSDeclaration.h"
 #include "nsINameSpaceManager.h"
 #include "nsXMLNameSpaceMap.h"
-#include "nsRuleNode.h"
-#include "nsUnicharUtils.h"
 #include "nsCSSPseudoElements.h"
-#include "nsIPrincipal.h"
-#include "nsComponentManagerUtils.h"
 #include "nsCSSPseudoClasses.h"
 #include "nsCSSAnonBoxes.h"
 #include "nsTArray.h"
@ -40,7 +30,8 @@
 #include "nsError.h"
 #include "mozAutoDocUpdate.h"

-#include "prlog.h"
+class nsIDOMCSSStyleDeclaration;
+class nsIDOMCSSStyleSheet;

 namespace css = mozilla::css;

--- a/layout/style/nsCSSAnonBoxes.cpp
+++ b/layout/style/nsCSSAnonBoxes.cpp
@ -10,8 +10,6 @@
 #include "nsCSSAnonBoxes.h"
 #include "nsAtomListUtils.h"
 #include "nsStaticAtom.h"
-#include "nsMemory.h"
-#include "nsCRT.h"

 using namespace mozilla;

--- a/layout/style/nsCSSKeywords.cpp
+++ b/layout/style/nsCSSKeywords.cpp
@ -9,7 +9,6 @@
 #include "nsString.h"
 #include "nsStaticNameTable.h"
 #include "nsReadableUtils.h"
-#include "nsStyleConsts.h"

 // required to make the symbol external, so that TestCSSPropertyLookup.cpp can link with it
 extern const char* const kCSSRawKeywords[];
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@ -22,31 +22,23 @@
 #include "nsCSSStyleSheet.h"
 #include "mozilla/css/Declaration.h"
 #include "nsStyleConsts.h"
-#include "nsIURL.h"
 #include "nsNetUtil.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsReadableUtils.h"
-#include "nsUnicharUtils.h"
 #include "nsIAtom.h"
-#include "nsCOMArray.h"
 #include "nsColor.h"
 #include "nsCSSPseudoClasses.h"
 #include "nsCSSPseudoElements.h"
-#include "nsCSSAnonBoxes.h"
 #include "nsINameSpaceManager.h"
 #include "nsXMLNameSpaceMap.h"
-#include "nsThemeConstants.h"
 #include "nsError.h"
 #include "nsIMediaList.h"
-#include "mozilla/LookAndFeel.h"
 #include "nsStyleUtil.h"
 #include "nsIPrincipal.h"
 #include "prprf.h"
-#include "math.h"
 #include "nsContentUtils.h"
 #include "nsAutoPtr.h"
-#include "prlog.h"
 #include "CSSCalc.h"
 #include "nsMediaFeatures.h"
 #include "nsLayoutUtils.h"
--- a/layout/style/nsCSSParser.h
+++ b/layout/style/nsCSSParser.h
@ -10,12 +10,10 @@

 #include "mozilla/Attributes.h"

-#include "nsAString.h"
 #include "nsCSSProperty.h"
-#include "nsColor.h"
-#include "nsCOMArray.h"
 #include "nsCOMPtr.h"
-#include "nsTArray.h"
+#include "nsStringFwd.h"
+#include "nsTArrayForwardDeclare.h"

 class nsCSSStyleSheet;
 class nsIPrincipal;
--- a/layout/style/nsCSSPseudoClasses.cpp
+++ b/layout/style/nsCSSPseudoClasses.cpp
@ -8,9 +8,7 @@
 #include "mozilla/Util.h"

 #include "nsCSSPseudoClasses.h"
-#include "nsAtomListUtils.h"
 #include "nsStaticAtom.h"
-#include "nsMemory.h"
 #include "mozilla/Preferences.h"

 using namespace mozilla;
--- a/layout/style/nsCSSPseudoClasses.h
+++ b/layout/style/nsCSSPseudoClasses.h
@ -8,7 +8,9 @@
 #ifndef nsCSSPseudoClasses_h___
 #define nsCSSPseudoClasses_h___

-#include "nsIAtom.h"
+#include "nsString.h"
+
+class nsIAtom;

 class nsCSSPseudoClasses {
 public:
--- a/layout/style/nsCSSPseudoElements.cpp
+++ b/layout/style/nsCSSPseudoElements.cpp
@ -10,7 +10,6 @@
 #include "nsCSSPseudoElements.h"
 #include "nsAtomListUtils.h"
 #include "nsStaticAtom.h"
-#include "nsMemory.h"
 #include "nsCSSAnonBoxes.h"

 using namespace mozilla;
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@ -14,7 +14,6 @@

 #include "nsString.h"
 #include "nsIAtom.h"
-#include "nsIURL.h"

 #include "nsCSSProps.h"
 #include "nsCSSStyleSheet.h"
@ -25,10 +24,8 @@
 #include "nsICSSRuleList.h"
 #include "nsIDocument.h"
 #include "nsPresContext.h"
-#include "nsRuleNode.h"

 #include "nsContentUtils.h"
-#include "nsStyleConsts.h"
 #include "nsError.h"
 #include "nsStyleUtil.h"
 #include "mozilla/css/Declaration.h"
--- a/layout/style/nsCSSRules.h
+++ b/layout/style/nsCSSRules.h
@ -12,7 +12,6 @@
 #include "mozilla/Attributes.h"

 #include "mozilla/css/GroupRule.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Preferences.h"
 #include "nsIDOMCSSConditionRule.h"
 #include "nsIDOMCSSFontFaceRule.h"
@ -23,7 +22,6 @@
 #include "nsIDOMMozCSSKeyframeRule.h"
 #include "nsIDOMMozCSSKeyframesRule.h"
 #include "nsIDOMCSSStyleDeclaration.h"
-#include "nsICSSRuleList.h"
 #include "nsAutoPtr.h"
 #include "nsCSSProperty.h"
 #include "nsCSSValue.h"
@ -37,6 +35,9 @@
 class nsMediaList;

 namespace mozilla {
+
+class ErrorResult;
+
 namespace css {

 class MediaRule MOZ_FINAL : public GroupRule,
--- a/layout/style/nsCSSScanner.cpp
+++ b/layout/style/nsCSSScanner.cpp
@ -6,8 +6,6 @@

 /* tokenization of CSS style sheets */

-#include <math.h> // must be first due to symbol conflicts
-
 #include "nsCSSScanner.h"
 #include "nsStyleUtil.h"
 #include "mozilla/css/ErrorReporter.h"
--- a/layout/style/nsCSSStyleSheet.cpp
+++ b/layout/style/nsCSSStyleSheet.cpp
@ -8,7 +8,6 @@

 #include "nsCSSStyleSheet.h"

-#include "nsCRT.h"
 #include "nsIAtom.h"
 #include "nsCSSRuleProcessor.h"
 #include "mozilla/dom/Element.h"
@ -35,7 +34,6 @@
 #include "nsContentUtils.h"
 #include "nsIScriptSecurityManager.h"
 #include "mozAutoDocUpdate.h"
-#include "mozilla/css/Declaration.h"
 #include "nsRuleNode.h"
 #include "nsMediaFeatures.h"
 #include "nsDOMClassInfoID.h"
--- a/layout/style/nsCSSStyleSheet.h
+++ b/layout/style/nsCSSStyleSheet.h
@ -94,7 +94,6 @@ private:
 //

 class CSSRuleListImpl;
-struct ChildSheetListBuilder;

 // CID for the nsCSSStyleSheet class
 // ca926f30-2a7e-477e-8467-803fb32af20a
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@ -12,21 +12,19 @@

 #include "nsError.h"
 #include "nsDOMString.h"
-#include "nsIDOMElement.h"
 #include "nsIDOMCSSPrimitiveValue.h"
 #include "nsStyleContext.h"
 #include "nsIScrollableFrame.h"
 #include "nsContentUtils.h"
-#include "prprf.h"
+#include "nsIContent.h"

 #include "nsCSSProps.h"
-#include "nsCSSKeywords.h"
 #include "nsDOMCSSRect.h"
+#include "nsDOMCSSRGBColor.h"
 #include "nsDOMCSSValueList.h"
 #include "nsFlexContainerFrame.h"
 #include "nsGkAtoms.h"
 #include "nsHTMLReflowState.h"
-#include "nsThemeConstants.h"
 #include "nsStyleUtil.h"
 #include "nsStyleStructInlines.h"
 #include "nsROCSSPrimitiveValue.h"
@ -38,14 +36,12 @@
 #include "nsStyleSet.h"
 #include "imgIRequest.h"
 #include "nsLayoutUtils.h"
-#include "nsFrameManager.h"
-#include "prlog.h"
 #include "nsCSSKeywords.h"
 #include "nsStyleCoord.h"
 #include "nsDisplayList.h"
 #include "nsDOMCSSDeclaration.h"
+#include "nsStyleTransformMatrix.h"
 #include "mozilla/dom/Element.h"
-#include "CSSCalc.h"
 #include "nsWrapperCacheInlines.h"
 #include <algorithm>

--- a/layout/style/nsComputedDOMStyle.h
+++ b/layout/style/nsComputedDOMStyle.h
@ -8,23 +8,27 @@
 #ifndef nsComputedDOMStyle_h__
 #define nsComputedDOMStyle_h__

-#include "mozilla/Attributes.h"
-#include "nsDOMCSSDeclaration.h"
-
-#include "nsDOMCSSRGBColor.h"
-#include "nsCSSProps.h"
-
-#include "nsIContent.h"
-#include "nsCOMPtr.h"
-#include "nsWeakReference.h"
 #include "nsAutoPtr.h"
-#include "nsStyleStruct.h"
+#include "mozilla/Attributes.h"
+#include "nsCOMPtr.h"
+#include "nscore.h"
+#include "nsCSSProperty.h"
+#include "nsDOMCSSDeclaration.h"
 #include "nsStyleContext.h"
+#include "nsStyleStruct.h"
+#include "nsIWeakReferenceUtils.h"
+
+namespace mozilla {
+namespace dom {
+class Element;
+}
+}

 class nsIFrame;
 class nsIPresShell;
 class nsDOMCSSValueList;
 class nsROCSSPrimitiveValue;
+class nsStyleContext;

 class nsComputedDOMStyle MOZ_FINAL : public nsDOMCSSDeclaration
 {
--- a/layout/style/nsDOMCSSAttrDeclaration.cpp
+++ b/layout/style/nsDOMCSSAttrDeclaration.cpp
@ -8,15 +8,12 @@
 #include "nsDOMCSSAttrDeclaration.h"

 #include "mozilla/css/Declaration.h"
-#include "mozilla/css/Loader.h"
 #include "mozilla/css/StyleRule.h"
 #include "mozilla/dom/Element.h"
 #include "nsIDocument.h"
 #include "nsIDOMMutationEvent.h"
-#include "nsIPrincipal.h"
 #include "nsIURI.h"
 #include "nsNodeUtils.h"
-#include "nsContentUtils.h"
 #include "xpcpublic.h"
 #include "nsWrapperCacheInlines.h"

--- a/layout/style/nsDOMCSSAttrDeclaration.h
+++ b/layout/style/nsDOMCSSAttrDeclaration.h
@ -12,13 +12,8 @@
 #include "nsDOMCSSDeclaration.h"

 #include "nsAutoPtr.h"
-#include "nsString.h"

 namespace mozilla {
-namespace css {
-class Loader;
-}
-
 namespace dom {
 class Element;
 }
--- a/layout/style/nsDOMCSSDeclaration.cpp
+++ b/layout/style/nsDOMCSSDeclaration.cpp
@ -6,18 +6,12 @@
 /* base class for DOM objects for element.style and cssStyleRule.style */

 #include "nsDOMCSSDeclaration.h"
-#include "nsIDOMCSSRule.h"
 #include "nsCSSParser.h"
-#include "mozilla/css/Loader.h"
 #include "nsCSSStyleSheet.h"
-#include "nsIStyleRule.h"
 #include "mozilla/css/Rule.h"
 #include "mozilla/css/Declaration.h"
 #include "nsCSSProps.h"
 #include "nsCOMPtr.h"
-#include "nsIURL.h"
-#include "nsReadableUtils.h"
-#include "nsIPrincipal.h"
 #include "mozAutoDocUpdate.h"

 using namespace mozilla;
--- a/layout/style/nsDOMCSSDeclaration.h
+++ b/layout/style/nsDOMCSSDeclaration.h
@ -13,8 +13,6 @@
 #include "nsCOMPtr.h"
 #include "mozilla/dom/CSS2PropertiesBinding.h"

-class nsCSSParser;
-class nsIURI;
 class nsIPrincipal;
 class nsIDocument;

--- a/layout/style/nsDOMCSSRGBColor.cpp
+++ b/layout/style/nsDOMCSSRGBColor.cpp
@ -6,9 +6,8 @@

 #include "nsDOMCSSRGBColor.h"

-#include "mozilla/dom/RGBColorBinding.h"
-#include "nsIDOMCSSPrimitiveValue.h"
 #include "nsContentUtils.h"
+#include "mozilla/dom/RGBColorBinding.h"
 #include "nsROCSSPrimitiveValue.h"

 using namespace mozilla;
--- a/layout/style/nsDOMCSSRect.cpp
+++ b/layout/style/nsDOMCSSRect.cpp
@ -6,11 +6,9 @@
 /* DOM object representing rectangle values in DOM computed style */

 #include "mozilla/dom/RectBinding.h"
-#include "nsISupports.h"
-#include "nsCOMPtr.h"
 #include "nsROCSSPrimitiveValue.h"
-#include "nsDOMCSSRect.h"
 #include "nsContentUtils.h"
+#include "nsDOMCSSRect.h"
 #include "nsDOMClassInfoID.h"

 using namespace mozilla;
--- a/layout/style/nsDOMCSSRect.h
+++ b/layout/style/nsDOMCSSRect.h
@ -9,7 +9,7 @@
 #define nsDOMCSSRect_h_

 #include "mozilla/Attributes.h"
-#include "nsISupports.h"
+#include "nsISupportsImpl.h"
 #include "nsIDOMRect.h"
 #include "nsAutoPtr.h"
 #include "nsCycleCollectionParticipant.h"
--- a/layout/style/nsDOMCSSValueList.cpp
+++ b/layout/style/nsDOMCSSValueList.cpp
@ -4,11 +4,9 @@

 /* DOM object representing lists of values in DOM computed style */

-#include "nsDOMCSSValueList.h"
-#include "nsCOMPtr.h"
-#include "mozilla/dom/CSSValueListBinding.h"
-#include "nsError.h"
 #include "nsContentUtils.h"
+#include "nsDOMCSSValueList.h"
+#include "mozilla/dom/CSSValueListBinding.h"

 using namespace mozilla;

--- a/layout/style/nsDOMCSSValueList.h
+++ b/layout/style/nsDOMCSSValueList.h
@ -9,11 +9,8 @@

 #include "nsIDOMCSSValueList.h"
 #include "CSSValue.h"
-#include "nsAutoPtr.h"
 #include "nsTArray.h"

-class nsComputedDOMStyle;
-
 class nsDOMCSSValueList MOZ_FINAL : public mozilla::dom::CSSValue,
  public nsIDOMCSSValueList
 {
--- a/layout/style/nsFontFaceLoader.cpp
+++ b/layout/style/nsFontFaceLoader.cpp
@ -14,11 +14,7 @@
 #include "nsFontFaceLoader.h"

 #include "nsError.h"
-#include "nsIFile.h"
-#include "nsIStreamListener.h"
 #include "nsNetUtil.h"
-#include "nsIChannelEventSink.h"
-#include "nsIInterfaceRequestor.h"
 #include "nsContentUtils.h"
 #include "mozilla/Preferences.h"

@ -27,13 +23,10 @@
 #include "nsIPrincipal.h"
 #include "nsIScriptSecurityManager.h"

-#include "nsDirectoryServiceUtils.h"
-#include "nsDirectoryServiceDefs.h"
 #include "nsIContentPolicy.h"
 #include "nsContentPolicyUtils.h"
 #include "nsCrossSiteListenerProxy.h"
 #include "nsIContentSecurityPolicy.h"
-#include "nsIChannelPolicy.h"
 #include "nsChannelPolicy.h"

 #include "nsIConsoleService.h"
--- a/layout/style/nsFontFaceLoader.h
+++ b/layout/style/nsFontFaceLoader.h
@ -11,15 +11,12 @@

 #include "nsCOMPtr.h"
 #include "nsIStreamLoader.h"
-#include "nsIURI.h"
 #include "nsIChannel.h"
-#include "nsITimer.h"
 #include "gfxUserFontSet.h"
 #include "nsHashKeys.h"
 #include "nsTHashtable.h"
 #include "nsCSSRules.h"

-class nsIRequest;
 class nsISupports;
 class nsPresContext;
 class nsIPrincipal;
--- a/layout/style/nsHTMLCSSStyleSheet.cpp
+++ b/layout/style/nsHTMLCSSStyleSheet.cpp
@ -8,18 +8,12 @@
 */

 #include "nsHTMLCSSStyleSheet.h"
-#include "nsCRT.h"
-#include "nsIAtom.h"
-#include "nsIURL.h"
-#include "nsCSSPseudoElements.h"
-#include "nsIStyleRule.h"
 #include "mozilla/css/StyleRule.h"
 #include "nsIStyleRuleProcessor.h"
 #include "nsPresContext.h"
 #include "nsIDocument.h"
 #include "nsCOMPtr.h"
 #include "nsRuleWalker.h"
-#include "nsRuleData.h"
 #include "nsRuleProcessorData.h"
 #include "mozilla/dom/Element.h"
 #include "nsAttrValue.h"
--- a/layout/style/nsHTMLStyleSheet.cpp
+++ b/layout/style/nsHTMLStyleSheet.cpp
@ -18,19 +18,13 @@
 */

 #include "nsHTMLStyleSheet.h"
-#include "nsINameSpaceManager.h"
-#include "nsIAtom.h"
-#include "nsIURL.h"
 #include "nsMappedAttributes.h"
-#include "nsILink.h"
-#include "nsStyleContext.h"
 #include "nsGkAtoms.h"
 #include "nsPresContext.h"
 #include "nsEventStates.h"
 #include "nsIDocument.h"
 #include "nsIPresShell.h"
 #include "nsStyleConsts.h"
-#include "nsCSSAnonBoxes.h"
 #include "nsRuleWalker.h"
 #include "nsRuleData.h"
 #include "nsError.h"
--- a/layout/style/nsHTMLStyleSheet.h
+++ b/layout/style/nsHTMLStyleSheet.h
@ -12,8 +12,6 @@
 #ifndef nsHTMLStyleSheet_h_
 #define nsHTMLStyleSheet_h_

-#include "mozilla/Attributes.h"
-
 #include "nsIStyleSheet.h"
 #include "nsIStyleRuleProcessor.h"
 #include "nsIStyleRule.h"
--- a/layout/style/nsLayoutStylesheetCache.cpp
+++ b/layout/style/nsLayoutStylesheetCache.cpp
@ -8,7 +8,6 @@
 #include "nsAppDirectoryServiceDefs.h"
 #include "mozilla/css/Loader.h"
 #include "nsIFile.h"
-#include "nsLayoutCID.h"
 #include "nsIMemoryReporter.h"
 #include "nsNetUtil.h"
 #include "nsIObserverService.h"
--- a/layout/style/nsLayoutStylesheetCache.h
+++ b/layout/style/nsLayoutStylesheetCache.h
@ -6,7 +6,6 @@
 #ifndef nsLayoutStylesheetCache_h__
 #define nsLayoutStylesheetCache_h__

-#include "nsCOMPtr.h"
 #include "nsIObserver.h"
 #include "nsAutoPtr.h"
 #include "mozilla/Attributes.h"
--- a/layout/style/nsMediaFeatures.cpp
+++ b/layout/style/nsMediaFeatures.cpp
@ -5,17 +5,12 @@

 /* the features that media queries can test */

-#include "mozilla/Util.h"
-
 #include "nsMediaFeatures.h"
 #include "nsGkAtoms.h"
 #include "nsCSSKeywords.h"
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
 #include "nsCSSValue.h"
-#include "nsIDocShell.h"
-#include "nsLayoutUtils.h"
-#include "mozilla/LookAndFeel.h"
 #include "nsCSSRuleProcessor.h"

 using namespace mozilla;
--- a/layout/style/nsMediaFeatures.h
+++ b/layout/style/nsMediaFeatures.h
@ -8,7 +8,7 @@
 #ifndef nsMediaFeatures_h_
 #define nsMediaFeatures_h_

-#include "nscore.h"
+#include "nsError.h"

 class nsIAtom;
 class nsPresContext;
--- a/layout/style/nsNthIndexCache.h
+++ b/layout/style/nsNthIndexCache.h
@ -5,7 +5,6 @@
 #ifndef nsContentIndexCache_h__
 #define nsContentIndexCache_h__

-#include "nscore.h"
 #include "js/HashTable.h"
 #include "mozilla/dom/Element.h"

--- a/layout/style/nsROCSSPrimitiveValue.cpp
+++ b/layout/style/nsROCSSPrimitiveValue.cpp
@ -7,8 +7,8 @@

 #include "nsROCSSPrimitiveValue.h"

-#include "nsContentUtils.h"
 #include "mozilla/dom/CSSPrimitiveValueBinding.h"
+#include "nsContentUtils.h"
 #include "nsPresContext.h"
 #include "nsStyleUtil.h"
 #include "nsDOMCSSRGBColor.h"
--- a/layout/style/nsROCSSPrimitiveValue.h
+++ b/layout/style/nsROCSSPrimitiveValue.h
@ -12,12 +12,10 @@
 #include "nsIDOMCSSPrimitiveValue.h"
 #include "nsCSSKeywords.h"
 #include "CSSValue.h"
-#include "nsAutoPtr.h"
+#include "nsCOMPtr.h"
 #include "nsCoord.h"
-#include "nsWrapperCache.h"

 class nsIURI;
-class nsComputedDOMStyle;
 class nsDOMCSSRect;
 class nsDOMCSSRGBColor;

--- a/layout/style/nsRuleData.cpp
+++ b/layout/style/nsRuleData.cpp
@ -4,7 +4,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsRuleData.h"
-#include "nsCSSProps.h"
 #include "nsPresArena.h"

 #include "mozilla/StandardInteger.h"
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@ -18,35 +18,27 @@

 #include "nsRuleNode.h"
 #include "nscore.h"
-#include "nsIServiceManager.h"
 #include "nsIWidget.h"
 #include "nsIPresShell.h"
 #include "nsFontMetrics.h"
 #include "gfxFont.h"
-#include "nsStyleUtil.h"
 #include "nsCSSPseudoElements.h"
 #include "nsThemeConstants.h"
-#include "nsITheme.h"
 #include "pldhash.h"
 #include "nsStyleContext.h"
 #include "nsStyleSet.h"
 #include "nsStyleStruct.h"
 #include "nsSize.h"
-#include "imgIRequest.h"
 #include "nsRuleData.h"
 #include "nsIStyleRule.h"
 #include "nsBidiUtils.h"
-#include "nsUnicharUtils.h"
 #include "nsStyleStructInlines.h"
-#include "nsStyleTransformMatrix.h"
-#include "nsCSSKeywords.h"
 #include "nsCSSProps.h"
 #include "nsTArray.h"
 #include "nsContentUtils.h"
 #include "CSSCalc.h"
 #include "nsPrintfCString.h"

-#include "mozilla/dom/Element.h"
 #include "mozilla/LookAndFeel.h"

 #if defined(_MSC_VER) || defined(__MINGW32__)
--- a/layout/style/nsRuleNode.h
+++ b/layout/style/nsRuleNode.h
@ -17,7 +17,6 @@
 #include "mozilla/StandardInteger.h"

 class nsStyleContext;
-struct PLDHashTable;
 struct nsRuleData;
 class nsIStyleRule;
 struct nsCSSValueList;
--- a/layout/style/nsStyleAnimation.cpp
+++ b/layout/style/nsStyleAnimation.cpp
@ -9,6 +9,7 @@
 #include "mozilla/MathAlgorithms.h"

 #include "nsStyleAnimation.h"
+#include "nsStyleTransformMatrix.h"
 #include "nsCOMArray.h"
 #include "nsIStyleRule.h"
 #include "mozilla/css/StyleRule.h"
@ -21,10 +22,8 @@
 #include "mozilla/dom/Element.h"
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/Likely.h"
-#include "prlog.h"
 #include "gfxMatrix.h"
 #include "gfxQuaternion.h"
-#include "nsPrintfCString.h"
 #include <cstdlib> // for std::abs(int/long)
 #include <cmath> // for std::abs(float/double)

--- a/layout/style/nsStyleAnimation.h
+++ b/layout/style/nsStyleAnimation.h
@ -16,9 +16,7 @@
 #include "nsColor.h"
 #include "nsCSSValue.h"

-class nsPresContext;
 class nsStyleContext;
-struct nsCSSRect;
 class gfx3DMatrix;

 namespace mozilla {
--- a/layout/style/nsStyleContext.cpp
+++ b/layout/style/nsStyleContext.cpp
@ -7,6 +7,7 @@

 #include "mozilla/DebugOnly.h"

+#include "nsCSSAnonBoxes.h"
 #include "nsStyleConsts.h"
 #include "nsString.h"
 #include "nsPresContext.h"
@ -18,7 +19,6 @@

 #include "nsRuleNode.h"
 #include "nsStyleContext.h"
-#include "prlog.h"
 #include "nsStyleAnimation.h"
 #include "sampler.h"

--- a/layout/style/nsStyleContext.h
+++ b/layout/style/nsStyleContext.h
@ -9,9 +9,9 @@
 #define _nsStyleContext_h_

 #include "nsRuleNode.h"
-#include "nsIAtom.h"
 #include "nsCSSPseudoElements.h"

+class nsIAtom;
 class nsPresContext;

 /**
--- a/layout/style/nsStyleCoord.cpp
+++ b/layout/style/nsStyleCoord.cpp
@ -6,11 +6,6 @@
 /* representation of length values in computed style data */

 #include "nsStyleCoord.h"
-#include "nsString.h"
-#include "nsCRT.h"
-#include "prlog.h"
-#include "nsMathUtils.h"
-#include "nsStyleContext.h"
 #include "mozilla/HashFunctions.h"

 nsStyleCoord::nsStyleCoord(nsStyleUnit aUnit)
--- a/layout/style/nsStyleCoord.h
+++ b/layout/style/nsStyleCoord.h
@ -8,12 +8,8 @@
 #ifndef nsStyleCoord_h___
 #define nsStyleCoord_h___

-#include "nscore.h"
 #include "nsCoord.h"
-#include "nsCRT.h"
 #include "nsStyleConsts.h"
-class nsString;
-class nsStyleContext;

 enum nsStyleUnit {
  eStyleUnit_Null         = 0,      // (no value) value is not specified
--- a/layout/style/nsStyleSet.cpp
+++ b/layout/style/nsStyleSet.cpp
@ -12,7 +12,6 @@
 #include "mozilla/Util.h"

 #include "nsStyleSet.h"
-#include "nsNetUtil.h"
 #include "nsCSSStyleSheet.h"
 #include "nsIDocumentInlines.h"
 #include "nsRuleWalker.h"
--- a/layout/style/nsStyleSet.h
+++ b/layout/style/nsStyleSet.h
@ -23,7 +23,6 @@
 #include "nsAutoPtr.h"
 #include "nsIStyleRule.h"
 #include "nsCSSPseudoElements.h"
-#include "nsCSSAnonBoxes.h"
 #include "mozilla/Attributes.h"

 class nsIURI;
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@ -15,22 +15,16 @@
 #include "nsString.h"
 #include "nsPresContext.h"
 #include "nsIWidget.h"
-#include "nsIStyleRule.h"
 #include "nsCRTGlue.h"
 #include "nsCSSProps.h"

 #include "nsCOMPtr.h"
-#include "nsIFrame.h"
-#include "nsHTMLReflowState.h"
-#include "prenv.h"

-#include "nsSVGUtils.h"
 #include "nsBidiUtils.h"
 #include "nsLayoutUtils.h"

 #include "imgIRequest.h"
 #include "imgIContainer.h"
-#include "prlog.h"

 #include "mozilla/Likely.h"
 #include <algorithm>
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@ -26,17 +26,13 @@
 #include "nsCOMArray.h"
 #include "nsTArray.h"
 #include "nsIAtom.h"
-#include "nsIURI.h"
 #include "nsCSSValue.h"
-#include "nsStyleTransformMatrix.h"
-#include "nsAlgorithm.h"
 #include "imgRequestProxy.h"
-#include "gfxRect.h"
 #include <algorithm>

 class nsIFrame;
+class nsIURI;
 class imgIContainer;
-struct nsCSSValueList;

 // Includes nsStyleStructID.
 #include "nsStyleStructFwd.h"
--- a/layout/style/nsStyleTransformMatrix.cpp
+++ b/layout/style/nsStyleTransformMatrix.cpp
@ -8,14 +8,10 @@
 */

 #include "nsStyleTransformMatrix.h"
-#include "nsAutoPtr.h"
 #include "nsCSSValue.h"
-#include "nsStyleContext.h"
 #include "nsPresContext.h"
 #include "nsRuleNode.h"
 #include "nsCSSKeywords.h"
-#include "nsMathUtils.h"
-#include "CSSCalc.h"
 #include "nsStyleAnimation.h"

 namespace css = mozilla::css;
--- a/layout/style/nsStyleTransformMatrix.h
+++ b/layout/style/nsStyleTransformMatrix.h
@ -13,11 +13,11 @@
 #include "nsCSSValue.h"
 #include "gfxMatrix.h"
 #include "gfx3DMatrix.h"
-#include "nsRect.h"

 struct nsCSSValueList;
 class nsStyleContext;
 class nsPresContext;
+struct nsRect;

 /**
 * A helper to generate gfxMatrixes from css transform functions.
--- a/layout/style/nsStyleUtil.cpp
+++ b/layout/style/nsStyleUtil.cpp
@ -3,21 +3,11 @@
 * 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 <math.h>
-
-#include "mozilla/Util.h"
-
 #include "nsStyleUtil.h"
-#include "nsCRT.h"
 #include "nsStyleConsts.h"

-#include "nsGkAtoms.h"
 #include "nsIContent.h"
-#include "nsINameSpaceManager.h"
-#include "nsIURI.h"
-#include "nsNetUtil.h"
 #include "nsReadableUtils.h"
-#include "nsTextFormatter.h"
 #include "nsCSSProps.h"
 #include "nsRuleNode.h"

--- a/layout/style/nsStyleUtil.h
+++ b/layout/style/nsStyleUtil.h
@ -7,16 +7,12 @@

 #include "nsCoord.h"
 #include "nsCSSProperty.h"
-#include "gfxFontFeatures.h"
-#include "nsTArray.h"
-#include "nsCSSValue.h"

-struct nsStyleBackground;
-class nsString;
+class nsCSSValue;
 class nsStringComparator;
 class nsIContent;
-
-
+struct gfxFontFeature;
+template <class E> class nsTArray;

 // Style utility functions
 class nsStyleUtil {
--- a/layout/svg/nsSVGIntegrationUtils.cpp
+++ b/layout/svg/nsSVGIntegrationUtils.cpp
@ -8,6 +8,7 @@

 // Keep others in (case-insensitive) order:
 #include "gfxDrawable.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsDisplayList.h"
 #include "nsLayoutUtils.h"
 #include "nsRenderingContext.h"