Bug 913830 - Remove more unneeded #includes from the xpconnect IDL files; r=bholley

content/base/src/nsDOMBlobBuilder.cpp

@@ -15,6 +15,7 @@
 #include "nsJSUtils.h"
 #include "nsContentUtils.h"
 #include "nsIScriptError.h"
+#include "nsIXPConnect.h"
 #include <algorithm>
 
 using namespace mozilla;

content/xslt/src/xslt/txMozillaXSLTProcessor.cpp

@@ -35,6 +35,7 @@
 #include "nsIErrorService.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsJSUtils.h"
+#include "nsIXPConnect.h"
 
 using namespace mozilla::dom;
 

dom/base/nsDOMClassInfo.h

@@ -12,6 +12,7 @@
 #include "nsIScriptGlobalObject.h"
 #include "nsIDOMScriptObjectFactory.h"
 #include "js/Id.h"
+#include "nsIXPConnect.h"
 
 #ifdef XP_WIN
 #undef GetClassName

js/xpconnect/idl/nsIXPCScriptable.idl

@@ -5,15 +5,26 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsIXPConnect.idl"
 #include "nsIClassInfo.idl"
 
 %{C++
 #ifdef XP_WIN
 #undef GetClassName
 #endif
+
+#include "js/TypeDecls.h"
+
+struct JSFreeOp;
 %}
 
+interface nsIXPConnectWrappedNative;
+
+[ptr] native JSContextPtr(JSContext);
+[ptr] native JSObjectPtr(JSObject);
+[ptr] native JSValPtr(JS::Value);
+[ptr] native JSFreeOpPtr(JSFreeOp);
+[ref] native JSCallArgsRef(const JS::CallArgs);
+
 /**
  * Note: This is not really an XPCOM interface.  For example, callers must
  * guarantee that they set the *_retval of the various methods that return a

js/xpconnect/idl/xpccomponents.idl

@@ -4,9 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "xpcexception.idl"
-#include "xpcjsid.idl"
-#include "nsIComponentManager.idl"
 
 %{C++
 #include "jspubtd.h"
@@ -14,6 +11,10 @@
 
 interface xpcIJSWeakReference;
 interface nsIClassInfo;
+interface nsIComponentManager;
+interface nsIJSCID;
+interface nsIJSIID;
+interface nsIStackFrame;
 
 /**
 * interface of Components.interfacesByID

storage/src/mozStorageAsyncStatement.cpp

@@ -24,6 +24,7 @@
 #include "mozStoragePrivateHelpers.h"
 #include "mozStorageStatementRow.h"
 #include "mozStorageStatement.h"
+#include "nsDOMClassInfo.h"
 
 #include "prlog.h"
 

storage/src/mozStorageStatement.cpp

@@ -24,6 +24,7 @@
 #include "mozStorageStatementRow.h"
 #include "mozStorageStatement.h"
 #include "GeckoProfiler.h"
+#include "nsDOMClassInfo.h"
 
 #include "prlog.h"