Bug 919341 - Minimize the #includes in xpcom/ IDL files; r=bsmedberg

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"

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;

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"

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"

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"

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)
 

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"

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"

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;

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"

dom/quota/FileStreams.cpp

@@ -7,6 +7,7 @@
 #include "FileStreams.h"
 
 #include "QuotaManager.h"
+#include "prio.h"
 
 USING_QUOTA_NAMESPACE
 

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"

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)
 

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"
 

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 */    \

netwerk/base/src/BackgroundFileSaver.cpp

@@ -15,6 +15,7 @@
 
 #include "BackgroundFileSaver.h"
 #include "mozilla/Telemetry.h"
+#include "nsIAsyncInputStream.h"
 
 namespace mozilla {
 namespace net {

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

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;

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

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.

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);

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"

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

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

toolkit/xre/ProfileReset.cpp

@@ -20,6 +20,7 @@
 #include "nsXREAppData.h"
 
 #include "mozilla/Services.h"
+#include "prtime.h"
 
 extern const nsXREAppData* gAppData;
 

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"

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"

xpcom/base/nsConsoleService.cpp

@@ -17,6 +17,7 @@
 #include "nsConsoleService.h"
 #include "nsConsoleMessage.h"
 #include "nsIClassInfoImpl.h"
+#include "nsIConsoleListener.h"
 
 #include "mozilla/Preferences.h"
 

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

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

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...

xpcom/components/nsCategoryManager.cpp

@@ -32,6 +32,7 @@
 #include "mozilla/Services.h"
 
 #include "ManifestParser.h"
+#include "nsISimpleEnumerator.h"
 
 using namespace mozilla;
 class nsIComponentLoaderManager;

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

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)
 

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 \

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

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

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 {

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"
 
 /*

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

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,

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

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>
 %}
 

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

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

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
  *

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;

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

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"

xpcom/io/nsLocalFileWin.cpp

@@ -40,6 +40,7 @@
 
 #include "nsXPIDLString.h"
 #include "prproces.h"
+#include "prlink.h"
 
 #include "mozilla/Mutex.h"
 #include "SpecialSystemDirectory.h"

xpcom/io/nsLocalFileWin.h

@@ -15,6 +15,7 @@
 #include "nsILocalFileWin.h"
 #include "nsIHashable.h"
 #include "nsIClassInfoImpl.h"
+#include "prio.h"
 
 #include "mozilla/Attributes.h"
 

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;
 

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;
 

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)]

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

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

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,

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)]