Bug 913531 - Remove the unnecessary #includes from nsIXPConnect.idl; r=bholley

content/base/public/nsHostObjectProtocolHandler.h

@@ -9,6 +9,7 @@
 #include "nsIProtocolHandler.h"
 #include "nsIURI.h"
 #include "nsCOMPtr.h"
+#include "nsIInputStream.h"
 
 #define BLOBURI_SCHEME "blob"
 #define MEDIASTREAMURI_SCHEME "mediastream"
@@ -18,7 +19,6 @@
 class nsIDOMBlob;
 class nsIDOMMediaStream;
 class nsIPrincipal;
-class nsIInputStream;
 
 namespace mozilla {
 namespace dom {

content/base/src/nsXMLHttpRequest.cpp

@@ -67,6 +67,7 @@
 #include "nsCharSeparatedTokenizer.h"
 #include "nsFormData.h"
 #include "nsStreamListenerWrapper.h"
+#include "xpcjsid.h"
 
 #include "nsWrapperCacheInlines.h"
 

content/base/src/nsXMLHttpRequest.h

@@ -48,6 +48,7 @@ class nsFormData;
 class nsIJARChannel;
 class nsILoadGroup;
 class nsIUnicodeDecoder;
+class nsIJSID;
 
 namespace mozilla {
 

content/html/content/src/HTMLAudioElement.cpp

@@ -18,6 +18,7 @@
 #include "AudioChannelCommon.h"
 #include <algorithm>
 #include "mozilla/Preferences.h"
+#include "nsComponentManagerUtils.h"
 
 static bool
 IsAudioAPIEnabled()

content/media/WebVTTLoadListener.cpp

@@ -6,6 +6,7 @@
 #include "WebVTTLoadListener.h"
 #include "mozilla/dom/TextTrackCue.h"
 #include "mozilla/dom/HTMLTrackElement.h"
+#include "nsIInputStream.h"
 
 namespace mozilla {
 namespace dom {

content/media/mediasource/MediaSource.cpp

@@ -11,6 +11,7 @@
 #include "SourceBuffer.h"
 #include "SourceBufferList.h"
 #include "nsContentTypeParser.h"
+#include "nsIInputStream.h"
 
 #ifdef PR_LOGGING
 PRLogModuleInfo* gMediaSourceLog;

content/media/mediasource/MediaSource.h

@@ -18,6 +18,8 @@
 #include "nsWrapperCache.h"
 #include "nscore.h"
 
+class nsIInputStream;
+
 namespace mozilla {
 namespace dom {
 

dom/base/nsDOMClassInfo.cpp

@@ -190,6 +190,7 @@
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/Likely.h"
 #include "WindowNamedPropertiesHandler.h"
+#include "nsIInterfaceInfoManager.h"
 
 #ifdef MOZ_TIME_MANAGER
 #include "TimeManager.h"

dom/base/nsDOMException.cpp

@@ -15,6 +15,7 @@
 #include "nsIDocument.h"
 #include "nsString.h"
 #include "prprf.h"
+#include "nsIException.h"
 
 using namespace mozilla;
 

dom/base/nsGlobalWindow.h

@@ -49,6 +49,7 @@
 
 #include "mozilla/dom/EventTarget.h"
 #include "Units.h"
+#include "nsComponentManagerUtils.h"
 
 #ifdef MOZ_B2G
 #include "nsIDOMWindowB2G.h"

dom/base/nsJSEnvironment.cpp

@@ -55,6 +55,7 @@
 #include "StructuredCloneTags.h"
 #include "mozilla/dom/ImageData.h"
 #include "mozilla/dom/ImageDataBinding.h"
+#include "nsAXPCNativeCallContext.h"
 
 #include "nsJSPrincipals.h"
 

dom/base/nsJSTimeoutHandler.cpp

@@ -17,6 +17,7 @@
 #include "mozilla/Likely.h"
 #include <algorithm>
 #include "mozilla/dom/FunctionBinding.h"
+#include "nsAXPCNativeCallContext.h"
 
 static const char kSetIntervalStr[] = "setInterval";
 static const char kSetTimeoutStr[] = "setTimeout";

dom/bindings/BindingUtils.h

@@ -28,6 +28,7 @@
 #include "nsTraceRefcnt.h"
 #include "qsObjectHelper.h"
 #include "xpcpublic.h"
+#include "nsIVariant.h"
 
 #include "nsWrapperCacheInlines.h"
 

dom/devicestorage/DeviceStorage.h

@@ -23,6 +23,8 @@
 #define DEVICESTORAGE_SDCARD     "sdcard"
 #define DEVICESTORAGE_CRASHES    "crashes"
 
+class nsIInputStream;
+
 namespace mozilla {
 namespace dom {
 class DeviceStorageEnumerationParameters;

dom/indexedDB/IndexedDatabase.h

@@ -17,6 +17,7 @@
 #include "nsError.h"
 #include "nsStringGlue.h"
 #include "nsTArray.h"
+#include "nsIInputStream.h"
 
 #define BEGIN_INDEXEDDB_NAMESPACE \
   namespace mozilla { namespace dom { namespace indexedDB {
@@ -28,7 +29,6 @@
   using namespace mozilla::dom::indexedDB;
 
 class nsIDOMBlob;
-class nsIInputStream;
 
 BEGIN_INDEXEDDB_NAMESPACE
 

dom/workers/XMLHttpRequest.cpp

@@ -30,6 +30,7 @@
 
 #include "DOMBindingInlines.h"
 #include "mozilla/Attributes.h"
+#include "nsComponentManagerUtils.h"
 
 using namespace mozilla;
 

embedding/components/find/src/nsWebBrowserFind.cpp

@@ -38,6 +38,7 @@
 #include "nsFocusManager.h"
 #include "mozilla/Services.h"
 #include "mozilla/dom/Element.h"
+#include "nsISimpleEnumerator.h"
 
 #if DEBUG
 #include "nsIWebNavigation.h"

js/xpconnect/idl/nsIXPCScriptable.idl

@@ -6,6 +6,7 @@
 
 #include "nsISupports.idl"
 #include "nsIXPConnect.idl"
+#include "nsIClassInfo.idl"
 
 %{C++
 #ifdef XP_WIN

js/xpconnect/idl/nsIXPConnect.idl

@@ -7,26 +7,15 @@
 /* The core XPConnect public interfaces. */
 
 #include "nsISupports.idl"
-#include "nsIClassInfo.idl"
-#include "xpccomponents.idl"
-#include "xpcjsid.idl"
-#include "xpcexception.idl"
-#include "nsIInterfaceInfo.idl"
-#include "nsIInterfaceInfoManager.idl"
-#include "nsIExceptionService.idl"
-#include "nsIVariant.idl"
-#include "nsIObjectOutputStream.idl"
-#include "nsIObjectInputStream.idl"
 
 %{ C++
 #include "jspubtd.h"
 #include "js/TypeDecls.h"
-#include "xptinfo.h"
-#include "nsAXPCNativeCallContext.h"
 
 struct JSFreeOp;
 
 class nsWrapperCache;
+class nsAXPCNativeCallContext;
 %}
 
 /***************************************************************************/
@@ -58,6 +47,11 @@ interface nsIXPConnectWrappedNative;
 interface nsIInterfaceInfo;
 interface nsIXPCSecurityManager;
 interface nsIPrincipal;
+interface nsIClassInfo;
+interface nsIVariant;
+interface nsIStackFrame;
+interface nsIObjectInputStream;
+interface nsIObjectOutputStream;
 
 /***************************************************************************/
 [uuid(909e8641-7c54-4dff-9b94-ba631f057b33)]

js/xpconnect/src/nsXPConnect.cpp

@@ -53,6 +53,8 @@
 #include "nsICycleCollectorListener.h"
 #include "nsThread.h"
 #include "mozilla/XPTInterfaceInfoManager.h"
+#include "nsIObjectInputStream.h"
+#include "nsIObjectOutputStream.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

js/xpconnect/src/xpcprivate.h

@@ -160,6 +160,7 @@
 #include "SandboxPrivate.h"
 #include "BackstagePass.h"
 #include "nsCxPusher.h"
+#include "nsAXPCNativeCallContext.h"
 
 #ifdef XP_WIN
 // Nasty MS defines

layout/style/nsCSSStyleSheet.cpp

@@ -40,6 +40,7 @@
 #include "nsDOMClassInfoID.h"
 #include "mozilla/Likely.h"
 #include "mozilla/dom/CSSStyleSheetBinding.h"
+#include "nsComponentManagerUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

layout/xul/base/src/nsBoxObject.cpp

@@ -23,6 +23,7 @@
 #include "nsISupportsPrimitives.h"
 #include "nsSupportsPrimitives.h"
 #include "mozilla/dom/Element.h"
+#include "nsComponentManagerUtils.h"
 
 using namespace mozilla::dom;
 

layout/xul/tree/nsTreeSelection.cpp

@@ -18,6 +18,7 @@
 #include "nsAsyncDOMEvent.h"
 #include "nsEventDispatcher.h"
 #include "nsAutoPtr.h"
+#include "nsComponentManagerUtils.h"
 
 // A helper class for managing our ranges of selection.
 struct nsTreeRange