Fix over-including dependencies, and relocate ID_TO_VALUE to avoid over-including (r=mrbkap, bustage fix).

js/src/jsprvtd.h

@@ -74,6 +74,8 @@
 #define OBJECT_TO_JSID(obj)         ((jsid)OBJECT_TO_JSVAL(obj))
 #define OBJECT_JSVAL_TO_JSID(v)     ((jsid)v)
 
+#define ID_TO_VALUE(id)             ((jsval)(id))
+
 /*
  * Convenience constants.
  */

js/src/jsscope.h

@@ -365,8 +365,6 @@ js_NewScope(JSContext *cx, jsrefcount nrefs, JSObjectOps *ops, JSClass *clasp,
 extern void
 js_DestroyScope(JSContext *cx, JSScope *scope);
 
-#define ID_TO_VALUE(id) ((jsval)(id))
-
 extern JS_FRIEND_API(JSScopeProperty **)
 js_SearchScope(JSScope *scope, jsid id, JSBool adding);
 

js/src/xpconnect/src/XPCNativeWrapper.cpp

@@ -40,8 +40,9 @@
 
 #include "xpcprivate.h"
 #include "XPCNativeWrapper.h"
-#include "jsdbgapi.h"
 #include "XPCWrapper.h"
+#include "jsdbgapi.h"
+#include "jsscope.h"
 
 JS_STATIC_DLL_CALLBACK(JSBool)
 XPC_NW_AddProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp);

js/src/xpconnect/src/XPCWrapper.cpp

@@ -41,6 +41,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "XPCWrapper.h"
+#include "jsscope.h"
 
 const PRUint32
 XPCWrapper::sWrappedObjSlot = 1;