diff --git a/mozilla/layout/style/nsCSSLoader.cpp b/mozilla/layout/style/nsCSSLoader.cpp
index c4ca5f3d578..082616da506 100644
--- a/mozilla/layout/style/nsCSSLoader.cpp
+++ b/mozilla/layout/style/nsCSSLoader.cpp
@@ -44,6 +44,7 @@
  * Date             Modified by     Description of modification
  * 04/20/2000       IBM Corp.      OS/2 VisualAge build.
  */
+#include "nsCSSLoader.h"
 #include "nsIContent.h"
 #include "nsIDOMNode.h"
 #include "nsIDOMWindow.h"
@@ -53,13 +54,13 @@
 #include "nsICharsetAlias.h"
 #include "nsUnicharUtils.h"
 #include "nsHashtable.h"
+#include "nsIURI.h"
 #include "nsIURL.h"
+#include "nsIParser.h"
 #include "nsIServiceManager.h"
 #include "nsNetUtil.h"
 #include "nsContentUtils.h"
 #include "nsCRT.h"
-#include "nsCOMArray.h"
-#include "nsCOMPtr.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsContentPolicyUtils.h"
 #include "nsIScriptGlobalObject.h"
@@ -68,8 +69,13 @@
 #include "nsIScriptError.h"
 #include "nsMimeTypes.h"
 #include "nsIAtom.h"
-#include "nsCSSLoader.h"
 #include "nsIDOM3Node.h"
+#include "nsICSSStyleSheet.h"
+#include "nsIStyleSheetLinkingElement.h"
+#include "nsICSSLoaderObserver.h"
+#include "nsICSSLoader.h"
+#include "nsICSSParser.h"
+#include "nsICSSImportRule.h"
 
 #ifdef MOZ_XUL
 #include "nsIXULPrototypeCache.h"
diff --git a/mozilla/layout/style/nsCSSLoader.h b/mozilla/layout/style/nsCSSLoader.h
index ea44b40819e..14fdb58f1e6 100644
--- a/mozilla/layout/style/nsCSSLoader.h
+++ b/mozilla/layout/style/nsCSSLoader.h
@@ -50,19 +50,23 @@
 #define nsCSSLoader_h__
 
 class CSSLoaderImpl;
+class nsIURI;
+class nsIParser;
+class nsICSSStyleSheet;
+class nsIStyleSheetLinkingElement;
+class nsICSSLoaderObserver;
+class nsICSSParser;
+class nsICSSImportRule;
+class nsMediaList;
 
-#include "nsIURI.h"
-#include "nsIParser.h"
-#include "nsICSSStyleSheet.h"
-#include "nsIStyleSheetLinkingElement.h"
-#include "nsICSSLoaderObserver.h"
 #include "nsICSSLoader.h"
-#include "nsICSSParser.h"
 #include "nsIUnicharStreamLoader.h"
+#include "nsCOMPtr.h"
+#include "nsCOMArray.h"
+#include "nsString.h"
 #include "nsURIHashKey.h"
 #include "nsInterfaceHashtable.h"
 #include "nsDataHashtable.h"
-class nsMediaList;
 
 /**
  * OVERALL ARCHITECTURE
diff --git a/mozilla/layout/style/nsCSSStyleSheet.cpp b/mozilla/layout/style/nsCSSStyleSheet.cpp
index b2ad49d9900..ff9d108af79 100644
--- a/mozilla/layout/style/nsCSSStyleSheet.cpp
+++ b/mozilla/layout/style/nsCSSStyleSheet.cpp
@@ -56,6 +56,7 @@
 #include "nsICSSStyleRule.h"
 #include "nsICSSNameSpaceRule.h"
 #include "nsICSSGroupRule.h"
+#include "nsICSSImportRule.h"
 #include "nsIMediaList.h"
 #include "nsIStyledContent.h"
 #include "nsIDocument.h"
diff --git a/mozilla/layout/style/nsICSSLoader.h b/mozilla/layout/style/nsICSSLoader.h
index 61020bf5a21..43054d5362e 100644
--- a/mozilla/layout/style/nsICSSLoader.h
+++ b/mozilla/layout/style/nsICSSLoader.h
@@ -40,7 +40,6 @@
 #include "nsISupports.h"
 #include "nsSubstring.h"
 #include "nsCompatibility.h"
-#include "nsICSSImportRule.h"
 
 class nsIAtom;
 class nsIURI;
@@ -53,6 +52,7 @@ class nsIDocument;
 class nsIUnicharInputStream;
 class nsICSSLoaderObserver;
 class nsMediaList;
+class nsICSSImportRule;
 
 // IID for the nsICSSLoader interface
 // 6c50f676-c764-4f2f-b62b-99d1076b44e9