diff --git a/js/src/builtin/TypedObject.cpp b/js/src/builtin/TypedObject.cpp
index 9bbe116146aa..b1361fab0e3b 100644
--- a/js/src/builtin/TypedObject.cpp
+++ b/js/src/builtin/TypedObject.cpp
@@ -23,8 +23,6 @@
 #include "jsatominlines.h"
 #include "jsobjinlines.h"
 
-#include "vm/Shape-inl.h"
-
 using mozilla::DebugOnly;
 
 using namespace js;
diff --git a/js/src/gc/Marking.cpp b/js/src/gc/Marking.cpp
index a7dd7449171d..4d72746d86bc 100644
--- a/js/src/gc/Marking.cpp
+++ b/js/src/gc/Marking.cpp
@@ -10,7 +10,6 @@
 
 #include "jit/IonCode.h"
 #include "vm/ArgumentsObject.h"
-#include "vm/ScopeObject.h"
 #include "vm/Shape.h"
 #include "vm/TypedArrayObject.h"
 
@@ -18,6 +17,7 @@
 #include "jsinferinlines.h"
 
 #include "gc/Nursery-inl.h"
+#include "vm/Shape-inl.h"
 #include "vm/String-inl.h"
 
 using namespace js;
diff --git a/js/src/jit/IonCaches.cpp b/js/src/jit/IonCaches.cpp
index 1dfb60798428..3c9c8e63ca76 100644
--- a/js/src/jit/IonCaches.cpp
+++ b/js/src/jit/IonCaches.cpp
@@ -20,7 +20,6 @@
 #include "vm/Shape.h"
 
 #include "vm/Interpreter-inl.h"
-#include "vm/Shape-inl.h"
 
 using namespace js;
 using namespace js::jit;
diff --git a/js/src/jit/arm/CodeGenerator-arm.cpp b/js/src/jit/arm/CodeGenerator-arm.cpp
index 42eec44d3c39..1993b88784bb 100644
--- a/js/src/jit/arm/CodeGenerator-arm.cpp
+++ b/js/src/jit/arm/CodeGenerator-arm.cpp
@@ -22,6 +22,7 @@
 #include "jsscriptinlines.h"
 
 #include "jit/shared/CodeGenerator-shared-inl.h"
+#include "vm/Shape-inl.h"
 
 using namespace js;
 using namespace js::jit;
diff --git a/js/src/jsapi-tests/testRegExpInstanceProperties.cpp b/js/src/jsapi-tests/testRegExpInstanceProperties.cpp
index c193759c0083..232f820917bf 100644
--- a/js/src/jsapi-tests/testRegExpInstanceProperties.cpp
+++ b/js/src/jsapi-tests/testRegExpInstanceProperties.cpp
@@ -11,6 +11,8 @@
 #include "jsapi-tests/tests.h"
 #include "vm/Shape.h"
 
+#include "vm/Shape-inl.h"
+
 BEGIN_TEST(testRegExpInstanceProperties)
 {
     jsval regexpProtoVal;
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 5f5b800006a4..d7a3341acc7f 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -88,6 +88,7 @@
 
 #include "vm/Interpreter-inl.h"
 #include "vm/ObjectImpl-inl.h"
+#include "vm/Shape-inl.h"
 #include "vm/String-inl.h"
 
 using namespace js;
diff --git a/js/src/jsobjinlines.h b/js/src/jsobjinlines.h
index 4e3e2d81f716..5882ccbb23da 100644
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -21,6 +21,8 @@
 #include "jsgcinlines.h"
 #include "jsinferinlines.h"
 
+#include "vm/Shape-inl.h"
+
 /* static */ inline bool
 JSObject::setGenericAttributes(JSContext *cx, js::HandleObject obj,
                                js::HandleId id, unsigned *attrsp)
diff --git a/js/src/vm/Shape-inl.h b/js/src/vm/Shape-inl.h
index cb12f74fbd8e..4cf4fe8cb587 100644
--- a/js/src/vm/Shape-inl.h
+++ b/js/src/vm/Shape-inl.h
@@ -9,9 +9,13 @@
 
 #include "vm/Shape.h"
 
+#include "mozilla/PodOperations.h"
+
+#include "jscntxt.h"
+#include "jsgc.h"
 #include "jsobj.h"
 
-#include "vm/Interpreter.h"
+#include "gc/Marking.h"
 #include "vm/ScopeObject.h"
 
 #include "jsatominlines.h"
diff --git a/js/src/vm/TypedArrayObject.cpp b/js/src/vm/TypedArrayObject.cpp
index c34a5bf4245e..1388c7f3e913 100644
--- a/js/src/vm/TypedArrayObject.cpp
+++ b/js/src/vm/TypedArrayObject.cpp
@@ -40,8 +40,6 @@
 #include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
-#include "vm/Shape-inl.h"
-
 #if JS_USE_NEW_OBJECT_REPRESENTATION
 // See the comment above OldObjectRepresentationHack.
 #  error "TypedArray support for new object representation unimplemented."