diff --git a/js/src/gc/Barrier-inl.h b/js/src/gc/Barrier-inl.h
index 5c601b481e8..3b221e28113 100644
--- a/js/src/gc/Barrier-inl.h
+++ b/js/src/gc/Barrier-inl.h
@@ -9,13 +9,6 @@
 
 #include "gc/Barrier.h"
 
-#include "jscompartment.h"
-
-#include "gc/Marking.h"
-#include "gc/StoreBuffer.h"
-
-#include "vm/String-inl.h"
-
 namespace js {
 
 inline const Value &
diff --git a/js/src/jsapi-tests/testGCFinalizeCallback.cpp b/js/src/jsapi-tests/testGCFinalizeCallback.cpp
index e796e424b4e..d4ad33c7fe7 100644
--- a/js/src/jsapi-tests/testGCFinalizeCallback.cpp
+++ b/js/src/jsapi-tests/testGCFinalizeCallback.cpp
@@ -9,8 +9,6 @@
 
 #include "jsapi-tests/tests.h"
 
-#include "vm/ObjectImpl-inl.h"
-
 const unsigned BufferSize = 20;
 static unsigned FinalizeCalls = 0;
 static JSFinalizeStatus StatusBuffer[BufferSize];
diff --git a/js/src/jscntxtinlines.h b/js/src/jscntxtinlines.h
index e7b7b3cd779..a55c3536dfc 100644
--- a/js/src/jscntxtinlines.h
+++ b/js/src/jscntxtinlines.h
@@ -8,6 +8,7 @@
 #define jscntxtinlines_h
 
 #include "jscntxt.h"
+#include "jscompartment.h"
 
 #include "jsiter.h"
 #include "jsworkers.h"
@@ -18,8 +19,6 @@
 #include "vm/Interpreter.h"
 #include "vm/ProxyObject.h"
 
-#include "gc/Barrier-inl.h"
-
 namespace js {
 
 #ifdef JS_CRASH_DIAGNOSTICS
diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index 707cce5e844..1a2053a9faf 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -29,8 +29,6 @@
 #include "jsgcinlines.h"
 #include "jsinferinlines.h"
 
-#include "gc/Barrier-inl.h"
-
 using namespace js;
 using namespace js::gc;
 
diff --git a/js/src/jscompartmentinlines.h b/js/src/jscompartmentinlines.h
index c371be006c8..c2a6c5ca118 100644
--- a/js/src/jscompartmentinlines.h
+++ b/js/src/jscompartmentinlines.h
@@ -9,6 +9,8 @@
 
 #include "jscompartment.h"
 
+#include "gc/Barrier-inl.h"
+
 inline void
 JSCompartment::initGlobal(js::GlobalObject &global)
 {
diff --git a/js/src/jsobjinlines.h b/js/src/jsobjinlines.h
index 850d9f747e5..5882ccbb23d 100644
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -18,6 +18,7 @@
 
 #include "jsatominlines.h"
 #include "jscompartmentinlines.h"
+#include "jsgcinlines.h"
 #include "jsinferinlines.h"
 
 #include "vm/Shape-inl.h"
diff --git a/js/src/jswatchpoint.cpp b/js/src/jswatchpoint.cpp
index 2a83ae3ea61..2a1111d6f59 100644
--- a/js/src/jswatchpoint.cpp
+++ b/js/src/jswatchpoint.cpp
@@ -14,8 +14,6 @@
 
 #include "jsgcinlines.h"
 
-#include "gc/Barrier-inl.h"
-
 using namespace js;
 using namespace js::gc;
 
diff --git a/js/src/jsweakmap.cpp b/js/src/jsweakmap.cpp
index f1f6095b32b..9271ddf767d 100644
--- a/js/src/jsweakmap.cpp
+++ b/js/src/jsweakmap.cpp
@@ -19,8 +19,6 @@
 
 #include "jsobjinlines.h"
 
-#include "gc/Barrier-inl.h"
-
 using namespace js;
 
 WeakMapBase::WeakMapBase(JSObject *memOf, JSCompartment *c)
diff --git a/js/src/vm/Interpreter-inl.h b/js/src/vm/Interpreter-inl.h
index c051f9464b7..287c0fa2d40 100644
--- a/js/src/vm/Interpreter-inl.h
+++ b/js/src/vm/Interpreter-inl.h
@@ -24,6 +24,7 @@
 #include "jsobjinlines.h"
 
 #include "vm/Stack-inl.h"
+#include "vm/String-inl.h"
 
 namespace js {
 
diff --git a/js/src/vm/ObjectImpl-inl.h b/js/src/vm/ObjectImpl-inl.h
index 3323b96521d..60cd7348138 100644
--- a/js/src/vm/ObjectImpl-inl.h
+++ b/js/src/vm/ObjectImpl-inl.h
@@ -9,12 +9,11 @@
 
 #include "vm/ObjectImpl.h"
 
+#include "jscntxt.h"
 #include "jsproxy.h"
 
 #include "vm/ProxyObject.h"
 
-#include "gc/Barrier-inl.h"
-
 /* static */ inline bool
 js::ObjectImpl::isExtensible(ExclusiveContext *cx, js::Handle<ObjectImpl*> obj, bool *extensible)
 {
diff --git a/js/src/vm/ScopeObject.cpp b/js/src/vm/ScopeObject.cpp
index 7c0f508d838..57c83934113 100644
--- a/js/src/vm/ScopeObject.cpp
+++ b/js/src/vm/ScopeObject.cpp
@@ -21,7 +21,6 @@
 #include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
-#include "gc/Barrier-inl.h"
 #include "vm/Stack-inl.h"
 
 using namespace js;