diff --git a/accessible/src/atk/AccessibleWrap.cpp b/accessible/src/atk/AccessibleWrap.cpp
index 6bb19fac695..57801ff3cf1 100644
--- a/accessible/src/atk/AccessibleWrap.cpp
+++ b/accessible/src/atk/AccessibleWrap.cpp
@@ -23,6 +23,7 @@
 #include "Relation.h"
 #include "RootAccessible.h"
 #include "States.h"
+#include "nsISimpleEnumerator.h"
 
 #include "mozilla/Util.h"
 #include "nsXPCOMStrings.h"
diff --git a/accessible/src/windows/msaa/AccessibleWrap.cpp b/accessible/src/windows/msaa/AccessibleWrap.cpp
index 737f37c09ff..fe0e772c9bd 100644
--- a/accessible/src/windows/msaa/AccessibleWrap.cpp
+++ b/accessible/src/windows/msaa/AccessibleWrap.cpp
@@ -44,6 +44,7 @@
 #include "oleacc.h"
 #include "nsIAccessibleTypes.h"
 #include "nsIPersistentProperties2.h"
+#include "nsISimpleEnumerator.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;
diff --git a/content/base/src/nsCopySupport.cpp b/content/base/src/nsCopySupport.cpp
index 3deac74541f..f6f31c52f7b 100644
--- a/content/base/src/nsCopySupport.cpp
+++ b/content/base/src/nsCopySupport.cpp
@@ -39,6 +39,7 @@
 #include "nsGUIEvent.h"
 #include "nsIFrame.h"
 #include "nsIURI.h"
+#include "nsISimpleEnumerator.h"
 
 // image copy stuff
 #include "nsIImageLoadingContent.h"
diff --git a/content/media/webspeech/synth/pico/nsPicoService.cpp b/content/media/webspeech/synth/pico/nsPicoService.cpp
index 71d036d883c..f6817c597ae 100644
--- a/content/media/webspeech/synth/pico/nsPicoService.cpp
+++ b/content/media/webspeech/synth/pico/nsPicoService.cpp
@@ -9,6 +9,7 @@
 #include "nsPrintfCString.h"
 #include "nsIWeakReferenceUtils.h"
 #include "SharedBuffer.h"
+#include "nsISimpleEnumerator.h"
 
 #include "mozilla/dom/nsSynthVoiceRegistry.h"
 #include "mozilla/dom/nsSpeechTask.h"
diff --git a/content/xbl/src/nsXBLPrototypeBinding.cpp b/content/xbl/src/nsXBLPrototypeBinding.cpp
index 2c299052987..7ebfa6e0acf 100644
--- a/content/xbl/src/nsXBLPrototypeBinding.cpp
+++ b/content/xbl/src/nsXBLPrototypeBinding.cpp
@@ -34,7 +34,7 @@
 #include "nsContentUtils.h"
 #include "nsTextFragment.h"
 #include "nsTextNode.h"
-
+#include "nsIInterfaceInfo.h"
 #include "nsIScriptError.h"
 
 #include "nsIStyleRuleProcessor.h"
diff --git a/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp b/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp
index e036dd1a706..a649832ec22 100644
--- a/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp
+++ b/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp
@@ -18,6 +18,7 @@
 #include "txXPathObjectAdaptor.h"
 #include "mozilla/Attributes.h"
 #include "nsIClassInfo.h"
+#include "nsIInterfaceInfo.h"
 
 NS_IMPL_ISUPPORTS1(txXPathObjectAdaptor, txIXPathObject)
 
diff --git a/dom/base/DOMException.cpp b/dom/base/DOMException.cpp
index aa22ac0b278..d5245d820e1 100644
--- a/dom/base/DOMException.cpp
+++ b/dom/base/DOMException.cpp
@@ -17,6 +17,7 @@
 #include "nsIDocument.h"
 #include "nsIDOMDOMException.h"
 #include "nsIException.h"
+#include "nsIProgrammingLanguage.h"
 #include "nsMemory.h"
 #include "prprf.h"
 #include "xpcprivate.h"
diff --git a/dom/base/nsScriptNameSpaceManager.cpp b/dom/base/nsScriptNameSpaceManager.cpp
index 32d48d6258b..3cdca72faa3 100644
--- a/dom/base/nsScriptNameSpaceManager.cpp
+++ b/dom/base/nsScriptNameSpaceManager.cpp
@@ -26,6 +26,7 @@
 #include "nsDOMClassInfo.h"
 #include "nsCRT.h"
 #include "nsIObserverService.h"
+#include "nsISimpleEnumerator.h"
 
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Preferences.h"
diff --git a/dom/indexedDB/Client.cpp b/dom/indexedDB/Client.cpp
index 5800dcce74e..163948e7a9f 100644
--- a/dom/indexedDB/Client.cpp
+++ b/dom/indexedDB/Client.cpp
@@ -13,6 +13,7 @@
 #include "IDBDatabase.h"
 #include "IndexedDatabaseManager.h"
 #include "TransactionThreadPool.h"
+#include "nsISimpleEnumerator.h"
 
 USING_INDEXEDDB_NAMESPACE
 using mozilla::dom::quota::AssertIsOnIOThread;
diff --git a/dom/plugins/base/nsPluginsDirUnix.cpp b/dom/plugins/base/nsPluginsDirUnix.cpp
index ad1744a97cd..6064e596e5c 100644
--- a/dom/plugins/base/nsPluginsDirUnix.cpp
+++ b/dom/plugins/base/nsPluginsDirUnix.cpp
@@ -11,6 +11,7 @@
 #include "prmem.h"
 #include "prenv.h"
 #include "prerror.h"
+#include "prio.h"
 #include <sys/stat.h>
 #include "nsString.h"
 #include "nsIFile.h"
diff --git a/dom/quota/FileStreams.cpp b/dom/quota/FileStreams.cpp
index be43fa990f7..82ad5c43794 100644
--- a/dom/quota/FileStreams.cpp
+++ b/dom/quota/FileStreams.cpp
@@ -7,6 +7,7 @@
 #include "FileStreams.h"
 
 #include "QuotaManager.h"
+#include "prio.h"
 
 USING_QUOTA_NAMESPACE
 
diff --git a/embedding/browser/webBrowser/nsEmbedStream.cpp b/embedding/browser/webBrowser/nsEmbedStream.cpp
index 4f311e67966..df44a0d4b6b 100644
--- a/embedding/browser/webBrowser/nsEmbedStream.cpp
+++ b/embedding/browser/webBrowser/nsEmbedStream.cpp
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsIAsyncInputStream.h"
+#include "nsIAsyncOutputStream.h"
 #include "nsIDocShell.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIPipe.h"
diff --git a/embedding/components/appstartup/src/nsAppStartupNotifier.cpp b/embedding/components/appstartup/src/nsAppStartupNotifier.cpp
index 72a40ad2f30..1e63557e8f3 100644
--- a/embedding/components/appstartup/src/nsAppStartupNotifier.cpp
+++ b/embedding/components/appstartup/src/nsAppStartupNotifier.cpp
@@ -11,7 +11,7 @@
 #include "nsXPCOM.h"
 #include "nsISupportsPrimitives.h"
 #include "nsAppStartupNotifier.h"
-
+#include "nsISimpleEnumerator.h"
 
 NS_IMPL_ISUPPORTS1(nsAppStartupNotifier, nsIObserver)
 
diff --git a/extensions/spellcheck/src/mozSpellChecker.cpp b/extensions/spellcheck/src/mozSpellChecker.cpp
index 35c3aedb96d..dee3a0f1e90 100644
--- a/extensions/spellcheck/src/mozSpellChecker.cpp
+++ b/extensions/spellcheck/src/mozSpellChecker.cpp
@@ -9,6 +9,7 @@
 #include "nsIStringEnumerator.h"
 #include "nsICategoryManager.h"
 #include "nsISupportsPrimitives.h"
+#include "nsISimpleEnumerator.h"
 
 #define DEFAULT_SPELL_CHECKER "@mozilla.org/spellchecker/engine;1"
 
diff --git a/extensions/spellcheck/src/mozSpellCheckerFactory.cpp b/extensions/spellcheck/src/mozSpellCheckerFactory.cpp
index 2cb7768b3c4..301f5d284bf 100644
--- a/extensions/spellcheck/src/mozSpellCheckerFactory.cpp
+++ b/extensions/spellcheck/src/mozSpellCheckerFactory.cpp
@@ -12,6 +12,7 @@
 #include "nsTextServicesCID.h"
 #include "mozPersonalDictionary.h"
 #include "mozSpellI18NManager.h"
+#include "nsIFile.h"
 
 #define NS_SPELLCHECKER_CID         \
 { /* 8227f019-afc7-461e-b030-9f185d7a0e29 */    \
diff --git a/netwerk/base/src/BackgroundFileSaver.cpp b/netwerk/base/src/BackgroundFileSaver.cpp
index 16f5dbffd10..27419bdc6b6 100644
--- a/netwerk/base/src/BackgroundFileSaver.cpp
+++ b/netwerk/base/src/BackgroundFileSaver.cpp
@@ -15,6 +15,7 @@
 
 #include "BackgroundFileSaver.h"
 #include "mozilla/Telemetry.h"
+#include "nsIAsyncInputStream.h"
 
 namespace mozilla {
 namespace net {
diff --git a/netwerk/base/src/nsDirectoryIndexStream.cpp b/netwerk/base/src/nsDirectoryIndexStream.cpp
index e5a93c83cac..f5c174f403e 100644
--- a/netwerk/base/src/nsDirectoryIndexStream.cpp
+++ b/netwerk/base/src/nsDirectoryIndexStream.cpp
@@ -17,6 +17,7 @@
 #include "nsEscape.h"
 #include "nsDirectoryIndexStream.h"
 #include "prlog.h"
+#include "prtime.h"
 #ifdef PR_LOGGING
 static PRLogModuleInfo* gLog;
 #endif
diff --git a/netwerk/cache/nsDeleteDir.cpp b/netwerk/cache/nsDeleteDir.cpp
index fd66c0c0f23..686d0cbd0be 100644
--- a/netwerk/cache/nsDeleteDir.cpp
+++ b/netwerk/cache/nsDeleteDir.cpp
@@ -14,6 +14,7 @@
 #include "nsThreadUtils.h"
 #include "nsISupportsPriority.h"
 #include "nsCacheUtils.h"
+#include "prtime.h"
 #include <time.h>
 
 using namespace mozilla;
diff --git a/netwerk/protocol/about/nsAboutCacheEntry.cpp b/netwerk/protocol/about/nsAboutCacheEntry.cpp
index 79b11243158..01ac7117e1e 100644
--- a/netwerk/protocol/about/nsAboutCacheEntry.cpp
+++ b/netwerk/protocol/about/nsAboutCacheEntry.cpp
@@ -9,6 +9,8 @@
 #include "nsNetUtil.h"
 #include "prprf.h"
 #include "nsEscape.h"
+#include "nsIAsyncInputStream.h"
+#include "nsIAsyncOutputStream.h"
 #include <algorithm>
 
 #define HEXDUMP_MAX_ROWS 16
diff --git a/netwerk/streamconv/src/nsStreamConverterService.cpp b/netwerk/streamconv/src/nsStreamConverterService.cpp
index b28b2e71355..1bb4c5fa8f9 100644
--- a/netwerk/streamconv/src/nsStreamConverterService.cpp
+++ b/netwerk/streamconv/src/nsStreamConverterService.cpp
@@ -32,6 +32,7 @@
 #include "nsTArray.h"
 #include "nsServiceManagerUtils.h"
 #include "nsHashtable.h"
+#include "nsISimpleEnumerator.h"
 
 ///////////////////////////////////////////////////////////////////
 // Breadth-First-Search (BFS) algorithm state classes and types.
diff --git a/netwerk/test/PropertiesTest.cpp b/netwerk/test/PropertiesTest.cpp
index 6af8a92f2f8..f750d99f5bb 100644
--- a/netwerk/test/PropertiesTest.cpp
+++ b/netwerk/test/PropertiesTest.cpp
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include "nsComponentManagerUtils.h"
 #include "nsServiceManagerUtils.h"
+#include "nsISimpleEnumerator.h"
 
 #define TEST_URL "resource:/res/test.properties"
 static NS_DEFINE_CID(kPersistentPropertiesCID, NS_IPERSISTENTPROPERTIES_CID);
diff --git a/storage/src/VacuumManager.cpp b/storage/src/VacuumManager.cpp
index 6f9567053f8..1100375cedd 100644
--- a/storage/src/VacuumManager.cpp
+++ b/storage/src/VacuumManager.cpp
@@ -14,6 +14,7 @@
 #include "nsIFile.h"
 #include "nsThreadUtils.h"
 #include "prlog.h"
+#include "prtime.h"
 
 #include "mozStorageConnection.h"
 #include "mozIStorageStatement.h"
diff --git a/storage/test/test_file_perms.cpp b/storage/test/test_file_perms.cpp
index c8966304790..1235fe09bd3 100644
--- a/storage/test/test_file_perms.cpp
+++ b/storage/test/test_file_perms.cpp
@@ -6,6 +6,7 @@
 
 #include "storage_test_harness.h"
 #include "nsIFile.h"
+#include "prio.h"
 
 /**
  * This file tests that the file permissions of the sqlite files match what
diff --git a/toolkit/components/places/Database.cpp b/toolkit/components/places/Database.cpp
index afdbdad53f4..9825ad71e99 100644
--- a/toolkit/components/places/Database.cpp
+++ b/toolkit/components/places/Database.cpp
@@ -26,6 +26,7 @@
 #include "nsPrintfCString.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
+#include "prtime.h"
 
 // Time between corrupt database backups.
 #define RECENT_BACKUP_TIME_MICROSEC (int64_t)86400 * PR_USEC_PER_SEC // 24H
diff --git a/toolkit/xre/ProfileReset.cpp b/toolkit/xre/ProfileReset.cpp
index b31e607ba5e..1311371e0ad 100644
--- a/toolkit/xre/ProfileReset.cpp
+++ b/toolkit/xre/ProfileReset.cpp
@@ -20,6 +20,7 @@
 #include "nsXREAppData.h"
 
 #include "mozilla/Services.h"
+#include "prtime.h"
 
 extern const nsXREAppData* gAppData;
 
diff --git a/tools/profiler/TableTicker.cpp b/tools/profiler/TableTicker.cpp
index 5e5b00baf69..493ad2866a0 100644
--- a/tools/profiler/TableTicker.cpp
+++ b/tools/profiler/TableTicker.cpp
@@ -13,6 +13,7 @@
 #include "platform.h"
 #include "nsThreadUtils.h"
 #include "prenv.h"
+#include "prtime.h"
 #include "shared-libraries.h"
 #include "mozilla/StackWalk.h"
 #include "TableTicker.h"
diff --git a/widget/gtk2/nsGtkIMModule.cpp b/widget/gtk2/nsGtkIMModule.cpp
index f67d4ca61c0..f1654c028ec 100644
--- a/widget/gtk2/nsGtkIMModule.cpp
+++ b/widget/gtk2/nsGtkIMModule.cpp
@@ -8,6 +8,7 @@
 #define FORCE_PR_LOG /* Allow logging in the release build */
 #endif // MOZ_LOGGING
 #include "prlog.h"
+#include "prtime.h"
 
 #include "nsGtkIMModule.h"
 #include "nsWindow.h"
diff --git a/xpcom/base/nsConsoleService.cpp b/xpcom/base/nsConsoleService.cpp
index d0890f4f592..ddd640448a2 100644
--- a/xpcom/base/nsConsoleService.cpp
+++ b/xpcom/base/nsConsoleService.cpp
@@ -17,6 +17,7 @@
 #include "nsConsoleService.h"
 #include "nsConsoleMessage.h"
 #include "nsIClassInfoImpl.h"
+#include "nsIConsoleListener.h"
 
 #include "mozilla/Preferences.h"
 
diff --git a/xpcom/base/nsIConsoleListener.idl b/xpcom/base/nsIConsoleListener.idl
index f9eb22f43e4..579a7eb4d19 100644
--- a/xpcom/base/nsIConsoleListener.idl
+++ b/xpcom/base/nsIConsoleListener.idl
@@ -8,7 +8,8 @@
  */
 
 #include "nsISupports.idl"
-#include "nsIConsoleMessage.idl"
+
+interface nsIConsoleMessage;
 
 [scriptable, uuid(eaaf61d6-1dd1-11b2-bc6e-8fc96480f20d)]
 interface nsIConsoleListener : nsISupports
diff --git a/xpcom/base/nsIConsoleService.idl b/xpcom/base/nsIConsoleService.idl
index 15e5a3c5105..fb9e906fb79 100644
--- a/xpcom/base/nsIConsoleService.idl
+++ b/xpcom/base/nsIConsoleService.idl
@@ -4,8 +4,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsIConsoleListener.idl"
-#include "nsIConsoleMessage.idl"
+
+interface nsIConsoleListener;
+interface nsIConsoleMessage;
 
 [scriptable, uuid(0eb81d20-c37e-42d4-82a8-ca9ae96bdf52)]
 interface nsIConsoleService : nsISupports
diff --git a/xpcom/base/nsIException.idl b/xpcom/base/nsIException.idl
index 7e7cac4d28f..77b760f4713 100644
--- a/xpcom/base/nsIException.idl
+++ b/xpcom/base/nsIException.idl
@@ -9,7 +9,6 @@
 
 
 #include "nsISupports.idl"
-#include "nsIProgrammingLanguage.idl"
 
 // XXX - most "string"s in this file should probably move to Unicode
 //       so may as well use AStrings...
diff --git a/xpcom/components/nsCategoryManager.cpp b/xpcom/components/nsCategoryManager.cpp
index e959bab23ab..132deee2aee 100644
--- a/xpcom/components/nsCategoryManager.cpp
+++ b/xpcom/components/nsCategoryManager.cpp
@@ -32,6 +32,7 @@
 #include "mozilla/Services.h"
 
 #include "ManifestParser.h"
+#include "nsISimpleEnumerator.h"
 
 using namespace mozilla;
 class nsIComponentLoaderManager;
diff --git a/xpcom/components/nsICategoryManager.idl b/xpcom/components/nsICategoryManager.idl
index e3e824fca24..e33d3ed8bfd 100644
--- a/xpcom/components/nsICategoryManager.idl
+++ b/xpcom/components/nsICategoryManager.idl
@@ -4,7 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsISimpleEnumerator.idl"
+
+interface nsISimpleEnumerator;
 
 /*
  * nsICategoryManager
diff --git a/xpcom/ds/nsAtomService.cpp b/xpcom/ds/nsAtomService.cpp
index 1ecbac3e69e..e336762e34d 100644
--- a/xpcom/ds/nsAtomService.cpp
+++ b/xpcom/ds/nsAtomService.cpp
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsAtomService.h"
+#include "nsIAtom.h"
 
 NS_IMPL_ISUPPORTS1(nsAtomService, nsIAtomService)
 
diff --git a/xpcom/ds/nsIAtomService.idl b/xpcom/ds/nsIAtomService.idl
index 2270445c637..37c094e3d93 100644
--- a/xpcom/ds/nsIAtomService.idl
+++ b/xpcom/ds/nsIAtomService.idl
@@ -3,7 +3,9 @@
  * 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 "nsIAtom.idl"
+#include "nsISupports.idl"
+
+interface nsIAtom;
 
 %{C++
 #define NS_ATOMSERVICE_CID \
diff --git a/xpcom/ds/nsICollection.idl b/xpcom/ds/nsICollection.idl
index 58a9a7c7a7b..463098937b1 100644
--- a/xpcom/ds/nsICollection.idl
+++ b/xpcom/ds/nsICollection.idl
@@ -4,7 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISerializable.idl"
-#include "nsIEnumerator.idl"
+
+interface nsIEnumerator;
 
 [scriptable, uuid(83b6019c-cbc4-11d2-8cca-0060b0fc14a3)]
 interface nsICollection : nsISerializable
diff --git a/xpcom/ds/nsIEnumerator.idl b/xpcom/ds/nsIEnumerator.idl
index e874e426baf..7569fb8a39d 100644
--- a/xpcom/ds/nsIEnumerator.idl
+++ b/xpcom/ds/nsIEnumerator.idl
@@ -3,7 +3,7 @@
  * 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 "nsISimpleEnumerator.idl"
+#include "nsISupports.idl"
 
 %{C++
 #define NS_ENUMERATOR_FALSE 1
diff --git a/xpcom/ds/nsIPersistentProperties2.idl b/xpcom/ds/nsIPersistentProperties2.idl
index 9fbb2619c4a..4da205977b1 100644
--- a/xpcom/ds/nsIPersistentProperties2.idl
+++ b/xpcom/ds/nsIPersistentProperties2.idl
@@ -3,12 +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 "nsISupports.idl"
 #include "nsIProperties.idl"
-#include "nsISimpleEnumerator.idl"
 
 interface nsIInputStream;
 interface nsIOutputStream;
+interface nsISimpleEnumerator;
 
 [scriptable, uuid(283EE646-1AEF-11D4-98B3-00C04fA0CE9A)]
 interface nsIPropertyElement : nsISupports {
diff --git a/xpcom/ds/nsISupportsArray.idl b/xpcom/ds/nsISupportsArray.idl
index 2cd71a28c1a..f8b90de7a42 100644
--- a/xpcom/ds/nsISupportsArray.idl
+++ b/xpcom/ds/nsISupportsArray.idl
@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 
-#include "nsISupports.idl"
 #include "nsICollection.idl"
 
 /*
diff --git a/xpcom/io/nsIBinaryInputStream.idl b/xpcom/io/nsIBinaryInputStream.idl
index 5d228dee4dc..ebc46e5674f 100644
--- a/xpcom/io/nsIBinaryInputStream.idl
+++ b/xpcom/io/nsIBinaryInputStream.idl
@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsIInputStream.idl"
-#include "nsrootidl.idl"
 
 /**
  * This interface allows consumption of primitive data types from a "binary
diff --git a/xpcom/io/nsIBinaryOutputStream.idl b/xpcom/io/nsIBinaryOutputStream.idl
index 7711aecd1c0..68b82642de9 100644
--- a/xpcom/io/nsIBinaryOutputStream.idl
+++ b/xpcom/io/nsIBinaryOutputStream.idl
@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsIOutputStream.idl"
-#include "nsrootidl.idl"
 
 /**
  * This interface allows writing of primitive data types (integers,
diff --git a/xpcom/io/nsIDirectoryService.idl b/xpcom/io/nsIDirectoryService.idl
index 520c9bc1112..6f58e37b9ce 100644
--- a/xpcom/io/nsIDirectoryService.idl
+++ b/xpcom/io/nsIDirectoryService.idl
@@ -4,7 +4,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsIFile.idl"
+
+interface nsIFile;
+interface nsISimpleEnumerator;
 
 /**
  * nsIDirectoryServiceProvider
diff --git a/xpcom/io/nsIFile.idl b/xpcom/io/nsIFile.idl
index effd27654f7..2392c6f4136 100644
--- a/xpcom/io/nsIFile.idl
+++ b/xpcom/io/nsIFile.idl
@@ -6,8 +6,8 @@
 #include "nsISupports.idl"
 
 %{C++
-#include "prio.h"
-#include "prlink.h"
+struct PRFileDesc;
+struct PRLibrary;
 #include <stdio.h>
 %}
 
diff --git a/xpcom/io/nsIObjectInputStream.idl b/xpcom/io/nsIObjectInputStream.idl
index 70f2a55e8dd..c482d3b89f2 100644
--- a/xpcom/io/nsIObjectInputStream.idl
+++ b/xpcom/io/nsIObjectInputStream.idl
@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsIBinaryInputStream.idl"
-#include "nsrootidl.idl"
 
 /**
  * @see nsIObjectOutputStream
diff --git a/xpcom/io/nsIObjectOutputStream.idl b/xpcom/io/nsIObjectOutputStream.idl
index 92c77b8b151..3ef6711d492 100644
--- a/xpcom/io/nsIObjectOutputStream.idl
+++ b/xpcom/io/nsIObjectOutputStream.idl
@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsIBinaryOutputStream.idl"
-#include "nsrootidl.idl"
 
 /**
  * @See nsIObjectInputStream
diff --git a/xpcom/io/nsIPipe.idl b/xpcom/io/nsIPipe.idl
index 93951ffe5b6..3ad20f236ef 100644
--- a/xpcom/io/nsIPipe.idl
+++ b/xpcom/io/nsIPipe.idl
@@ -3,9 +3,10 @@
  * 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 "nsIAsyncInputStream.idl"
-#include "nsIAsyncOutputStream.idl"
+#include "nsISupports.idl"
 
+interface nsIAsyncInputStream;
+interface nsIAsyncOutputStream;
 interface nsIMemory;
 
 /**
@@ -100,6 +101,9 @@ interface nsISearchableInputStream : nsISupports
 
 %{C++
 
+class nsIInputStream;
+class nsIOutputStream;
+
 /**
  * NS_NewPipe2
  *
diff --git a/xpcom/io/nsIStorageStream.idl b/xpcom/io/nsIStorageStream.idl
index e49e80d00d0..0313e2b3a41 100644
--- a/xpcom/io/nsIStorageStream.idl
+++ b/xpcom/io/nsIStorageStream.idl
@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsrootidl.idl"
 
 interface nsIMemory;
 interface nsIInputStream;
diff --git a/xpcom/io/nsIStreamBufferAccess.idl b/xpcom/io/nsIStreamBufferAccess.idl
index 002fb2f1e92..c37afd8dc24 100644
--- a/xpcom/io/nsIStreamBufferAccess.idl
+++ b/xpcom/io/nsIStreamBufferAccess.idl
@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsrootidl.idl"
 
 /**
  * An interface for access to a buffering stream implementation's underlying
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
index ff8e54a79b7..ffaacdd1a95 100644
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
@@ -43,6 +43,7 @@
 #include "nsIDirectoryEnumerator.h"
 #include "nsISimpleEnumerator.h"
 #include "private/pprio.h"
+#include "prlink.h"
 
 #ifdef MOZ_WIDGET_GTK
 #include "nsIGIOService.h"
diff --git a/xpcom/io/nsLocalFileWin.cpp b/xpcom/io/nsLocalFileWin.cpp
index a94b0ecd9b3..a9d7c7eef76 100644
--- a/xpcom/io/nsLocalFileWin.cpp
+++ b/xpcom/io/nsLocalFileWin.cpp
@@ -40,6 +40,7 @@
 
 #include "nsXPIDLString.h"
 #include "prproces.h"
+#include "prlink.h"
 
 #include "mozilla/Mutex.h"
 #include "SpecialSystemDirectory.h"
diff --git a/xpcom/io/nsLocalFileWin.h b/xpcom/io/nsLocalFileWin.h
index 740836f2612..9a796dfd6ea 100644
--- a/xpcom/io/nsLocalFileWin.h
+++ b/xpcom/io/nsLocalFileWin.h
@@ -15,6 +15,7 @@
 #include "nsILocalFileWin.h"
 #include "nsIHashable.h"
 #include "nsIClassInfoImpl.h"
+#include "prio.h"
 
 #include "mozilla/Attributes.h"
 
diff --git a/xpcom/io/nsPipe3.cpp b/xpcom/io/nsPipe3.cpp
index 2f4b17d1e5e..c5d88b0a56f 100644
--- a/xpcom/io/nsPipe3.cpp
+++ b/xpcom/io/nsPipe3.cpp
@@ -16,6 +16,8 @@
 #include "nsIClassInfoImpl.h"
 #include "nsAlgorithm.h"
 #include "nsMemory.h"
+#include "nsIAsyncInputStream.h"
+#include "nsIAsyncOutputStream.h"
 
 using namespace mozilla;
 
diff --git a/xpcom/io/nsStreamUtils.cpp b/xpcom/io/nsStreamUtils.cpp
index cf2c6aaba73..a923f3a0649 100644
--- a/xpcom/io/nsStreamUtils.cpp
+++ b/xpcom/io/nsStreamUtils.cpp
@@ -13,6 +13,8 @@
 #include "nsIRunnable.h"
 #include "nsISafeOutputStream.h"
 #include "nsString.h"
+#include "nsIAsyncInputStream.h"
+#include "nsIAsyncOutputStream.h"
 
 using namespace mozilla;
 
diff --git a/xpcom/reflect/xptinfo/public/nsIInterfaceInfoManager.idl b/xpcom/reflect/xptinfo/public/nsIInterfaceInfoManager.idl
index f0db98a2f6e..5ce8372b044 100644
--- a/xpcom/reflect/xptinfo/public/nsIInterfaceInfoManager.idl
+++ b/xpcom/reflect/xptinfo/public/nsIInterfaceInfoManager.idl
@@ -7,9 +7,9 @@
 
 
 #include "nsISupports.idl"
-#include "nsIInterfaceInfo.idl"
-#include "nsIEnumerator.idl"
-#include "nsISimpleEnumerator.idl"
+
+interface nsIInterfaceInfo;
+interface nsIEnumerator;
 
 /* this is NOT intended to be scriptable */
 [uuid(1d53d8d9-1d92-428f-b5cc-198b55e897d7)]
diff --git a/xpcom/system/nsIGConfService.idl b/xpcom/system/nsIGConfService.idl
index ddbee4bae9b..ccc02610f2c 100644
--- a/xpcom/system/nsIGConfService.idl
+++ b/xpcom/system/nsIGConfService.idl
@@ -4,7 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsIArray.idl"
+
+interface nsIArray;
 
 [scriptable, uuid(5009acae-6973-48c3-b6d6-52c692cc5d9d)]
 interface nsIGConfService : nsISupports
diff --git a/xpcom/system/nsIGSettingsService.idl b/xpcom/system/nsIGSettingsService.idl
index ac9c4cbb007..26d86a77e0d 100644
--- a/xpcom/system/nsIGSettingsService.idl
+++ b/xpcom/system/nsIGSettingsService.idl
@@ -4,7 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsIArray.idl"
+
+interface nsIArray;
 
 [scriptable, uuid(16d5b0ed-e756-4f1b-a8ce-9132e869acd8)]
 interface nsIGSettingsCollection : nsISupports
diff --git a/xpcom/tests/TestPipe.cpp b/xpcom/tests/TestPipe.cpp
index fc41b4e6145..b507184deaa 100644
--- a/xpcom/tests/TestPipe.cpp
+++ b/xpcom/tests/TestPipe.cpp
@@ -8,6 +8,8 @@
 #include "nsIPipe.h"
 #include "nsIMemory.h"
 #include "mozilla/Attributes.h"
+#include "nsIAsyncInputStream.h"
+#include "nsIAsyncOutputStream.h"
 
 /** NS_NewPipe2 reimplemented, because it's not exported by XPCOM */
 nsresult TP_NewPipe2(nsIAsyncInputStream** input,
diff --git a/xpcom/threads/nsIProcess.idl b/xpcom/threads/nsIProcess.idl
index 49e57175ba3..2c7dcd55ea8 100644
--- a/xpcom/threads/nsIProcess.idl
+++ b/xpcom/threads/nsIProcess.idl
@@ -2,9 +2,9 @@
  * 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 "nsIFile.idl"
 #include "nsISupports.idl"
 
+interface nsIFile;
 interface nsIObserver;
 
 [scriptable, uuid(609610de-9954-4a63-8a7c-346350a86403)]