diff --git a/dom/indexedDB/IDBCursor.cpp b/dom/indexedDB/IDBCursor.cpp
index bc47b73de52..0d3985d578d 100644
--- a/dom/indexedDB/IDBCursor.cpp
+++ b/dom/indexedDB/IDBCursor.cpp
@@ -39,7 +39,6 @@
 
 #include "IDBCursor.h"
 
-#include "jscntxt.h"
 #include "mozilla/storage.h"
 #include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"
diff --git a/dom/indexedDB/IDBDatabase.cpp b/dom/indexedDB/IDBDatabase.cpp
index edb4ef406d7..ec9590c2a0e 100644
--- a/dom/indexedDB/IDBDatabase.cpp
+++ b/dom/indexedDB/IDBDatabase.cpp
@@ -39,7 +39,6 @@
 
 #include "IDBDatabase.h"
 
-#include "jscntxt.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/storage.h"
 #include "nsDOMClassInfo.h"
diff --git a/dom/indexedDB/IDBEvents.cpp b/dom/indexedDB/IDBEvents.cpp
index 69b9a67d3fd..26a458e8462 100644
--- a/dom/indexedDB/IDBEvents.cpp
+++ b/dom/indexedDB/IDBEvents.cpp
@@ -42,7 +42,6 @@
 #include "nsIIDBDatabaseException.h"
 #include "nsIPrivateDOMEvent.h"
 
-#include "jscntxt.h"
 #include "nsContentUtils.h"
 #include "nsDOMClassInfoID.h"
 #include "nsDOMException.h"
diff --git a/dom/indexedDB/IDBKeyRange.cpp b/dom/indexedDB/IDBKeyRange.cpp
index f28c84d20df..dcbb7ddcc76 100644
--- a/dom/indexedDB/IDBKeyRange.cpp
+++ b/dom/indexedDB/IDBKeyRange.cpp
@@ -41,7 +41,6 @@
 
 #include "nsIXPConnect.h"
 
-#include "jscntxt.h"
 #include "nsDOMClassInfo.h"
 #include "nsJSUtils.h"
 #include "nsThreadUtils.h"
diff --git a/dom/workers/ChromeWorkerScope.cpp b/dom/workers/ChromeWorkerScope.cpp
index 296ac6cadb9..e407262f729 100644
--- a/dom/workers/ChromeWorkerScope.cpp
+++ b/dom/workers/ChromeWorkerScope.cpp
@@ -39,7 +39,6 @@
 #include "ChromeWorkerScope.h"
 
 #include "jsapi.h"
-#include "jscntxt.h"
 
 #include "nsXPCOM.h"
 #include "nsNativeCharsetUtils.h"
diff --git a/js/src/jsproxy.h b/js/src/jsproxy.h
index 6ca95c0fc3a..3377f98247e 100644
--- a/js/src/jsproxy.h
+++ b/js/src/jsproxy.h
@@ -43,8 +43,6 @@
 #define jsproxy_h___
 
 #include "jsapi.h"
-
-#include "jscntxt.h"
 #include "jsfriendapi.h"
 
 namespace js {
diff --git a/js/src/jswrapper.h b/js/src/jswrapper.h
index 0b76f62e34f..a86af286b9b 100644
--- a/js/src/jswrapper.h
+++ b/js/src/jswrapper.h
@@ -49,6 +49,8 @@
 
 namespace js {
 
+class DummyFrameGuard;
+
 /* No-op wrapper handler base class. */
 class JS_FRIEND_API(Wrapper) : public ProxyHandler
 {
diff --git a/js/xpconnect/loader/mozJSSubScriptLoader.cpp b/js/xpconnect/loader/mozJSSubScriptLoader.cpp
index 741c361c118..6457f2c8fdf 100644
--- a/js/xpconnect/loader/mozJSSubScriptLoader.cpp
+++ b/js/xpconnect/loader/mozJSSubScriptLoader.cpp
@@ -59,7 +59,6 @@
 #include "nsScriptLoader.h"
 
 #include "jsapi.h"
-#include "jscntxt.h"
 #include "jsdbgapi.h"
 #include "jsfriendapi.h"