diff --git a/js/src/asmjs/AsmJSValidate.cpp b/js/src/asmjs/AsmJSValidate.cpp
index d29b8b1a723b..7928a633117c 100644
--- a/js/src/asmjs/AsmJSValidate.cpp
+++ b/js/src/asmjs/AsmJSValidate.cpp
@@ -44,7 +44,6 @@
 #include "vm/HelperThreads.h"
 #include "vm/Interpreter.h"
 
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 #include "frontend/ParseNode-inl.h"
diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp
index a347e08813a8..817376ec8c23 100644
--- a/js/src/frontend/BytecodeEmitter.cpp
+++ b/js/src/frontend/BytecodeEmitter.cpp
@@ -540,8 +540,8 @@ EmitLoopEntry(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *nextpn)
 }
 
 /*
- * If op is JOF_TYPESET (see the type barriers comment in jsinfer.h), reserve
- * a type set to store its result.
+ * If op is JOF_TYPESET (see the type barriers comment in TypeInference.h),
+ * reserve a type set to store its result.
  */
 static inline void
 CheckTypeSet(ExclusiveContext *cx, BytecodeEmitter *bce, JSOp op)
diff --git a/js/src/frontend/FoldConstants.cpp b/js/src/frontend/FoldConstants.cpp
index f6a0cd44fd15..f125925a9c4d 100644
--- a/js/src/frontend/FoldConstants.cpp
+++ b/js/src/frontend/FoldConstants.cpp
@@ -15,7 +15,6 @@
 #include "js/Conversions.h"
 
 #include "jscntxtinlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 using namespace js;
diff --git a/js/src/gc/Marking.cpp b/js/src/gc/Marking.cpp
index b05152c46cde..907ef6a62f1b 100644
--- a/js/src/gc/Marking.cpp
+++ b/js/src/gc/Marking.cpp
@@ -22,7 +22,6 @@
 #include "vm/UnboxedObject.h"
 
 #include "jscompartmentinlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 #include "gc/Nursery-inl.h"
diff --git a/js/src/gc/Nursery.cpp b/js/src/gc/Nursery.cpp
index ada17d475282..bede38656d65 100644
--- a/js/src/gc/Nursery.cpp
+++ b/js/src/gc/Nursery.cpp
@@ -11,7 +11,6 @@
 
 #include "jscompartment.h"
 #include "jsgc.h"
-#include "jsinfer.h"
 #include "jsutil.h"
 #include "prmjtime.h"
 
@@ -24,6 +23,7 @@
 #include "vm/ScopeObject.h"
 #endif
 #include "vm/TypedArrayObject.h"
+#include "vm/TypeInference.h"
 
 #include "jsgcinlines.h"
 
diff --git a/js/src/gc/Zone.h b/js/src/gc/Zone.h
index 0f17dc0f0cb8..396050fd7216 100644
--- a/js/src/gc/Zone.h
+++ b/js/src/gc/Zone.h
@@ -12,11 +12,11 @@
 #include "mozilla/MemoryReporting.h"
 
 #include "jscntxt.h"
-#include "jsinfer.h"
 
 #include "gc/FindSCCs.h"
 #include "gc/GCRuntime.h"
 #include "js/TracingAPI.h"
+#include "vm/TypeInference.h"
 
 namespace js {
 
diff --git a/js/src/jit/Ion.cpp b/js/src/jit/Ion.cpp
index ff3950b6c23a..96b619925fe9 100644
--- a/js/src/jit/Ion.cpp
+++ b/js/src/jit/Ion.cpp
@@ -44,7 +44,6 @@
 
 #include "jscompartmentinlines.h"
 #include "jsgcinlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 using namespace js;
diff --git a/js/src/jit/IonAnalysis.cpp b/js/src/jit/IonAnalysis.cpp
index df8d92748f7b..14ac432ef703 100644
--- a/js/src/jit/IonAnalysis.cpp
+++ b/js/src/jit/IonAnalysis.cpp
@@ -16,7 +16,6 @@
 #include "jit/Lowering.h"
 #include "jit/MIRGraph.h"
 
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 #include "jsopcodeinlines.h"
 
diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp
index e9b427023187..be595c2b3b81 100644
--- a/js/src/jit/IonBuilder.cpp
+++ b/js/src/jit/IonBuilder.cpp
@@ -23,8 +23,6 @@
 #include "vm/RegExpStatics.h"
 #include "vm/TraceLogging.h"
 
-#include "jsinferinlines.h"
-#include "jsobjinlines.h"
 #include "jsopcodeinlines.h"
 #include "jsscriptinlines.h"
 
diff --git a/js/src/jit/IonCode.h b/js/src/jit/IonCode.h
index 6393eca0044b..eb114d94e4a9 100644
--- a/js/src/jit/IonCode.h
+++ b/js/src/jit/IonCode.h
@@ -11,7 +11,6 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/PodOperations.h"
 
-#include "jsinfer.h"
 #include "jstypes.h"
 
 #include "gc/Heap.h"
@@ -20,6 +19,7 @@
 #include "jit/IonTypes.h"
 #include "js/UbiNode.h"
 #include "vm/TraceLogging.h"
+#include "vm/TypeInference.h"
 
 namespace js {
 
diff --git a/js/src/jit/JitFrames.cpp b/js/src/jit/JitFrames.cpp
index b4c9e11a2c50..dd9fa059b485 100644
--- a/js/src/jit/JitFrames.cpp
+++ b/js/src/jit/JitFrames.cpp
@@ -7,7 +7,6 @@
 #include "jit/JitFrames-inl.h"
 
 #include "jsfun.h"
-#include "jsinfer.h"
 #include "jsobj.h"
 #include "jsscript.h"
 
@@ -31,13 +30,14 @@
 #include "vm/Interpreter.h"
 #include "vm/SPSProfiler.h"
 #include "vm/TraceLogging.h"
+#include "vm/TypeInference.h"
 
-#include "jsinferinlines.h"
 #include "jsscriptinlines.h"
 #include "gc/Nursery-inl.h"
 #include "jit/JitFrameIterator-inl.h"
 #include "vm/Debugger-inl.h"
 #include "vm/Probes-inl.h"
+#include "vm/TypeInference-inl.h"
 
 namespace js {
 namespace jit {
diff --git a/js/src/jit/JitOptions.h b/js/src/jit/JitOptions.h
index 7654de0466c1..ad29f76e11c1 100644
--- a/js/src/jit/JitOptions.h
+++ b/js/src/jit/JitOptions.h
@@ -7,6 +7,8 @@
 #ifndef jit_JitOptions_h
 #define jit_JitOptions_h
 
+#include "mozilla/Maybe.h"
+
 #include "jit/IonTypes.h"
 #include "js/TypeDecls.h"
 
diff --git a/js/src/jit/Lowering.cpp b/js/src/jit/Lowering.cpp
index 3a72f308172b..5c009280be17 100644
--- a/js/src/jit/Lowering.cpp
+++ b/js/src/jit/Lowering.cpp
@@ -13,7 +13,6 @@
 #include "jit/MIR.h"
 #include "jit/MIRGraph.h"
 
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 #include "jsopcodeinlines.h"
 
diff --git a/js/src/jit/MIR.cpp b/js/src/jit/MIR.cpp
index 2d7f540ab599..0d253b743e1a 100644
--- a/js/src/jit/MIR.cpp
+++ b/js/src/jit/MIR.cpp
@@ -22,7 +22,6 @@
 #include "js/Conversions.h"
 
 #include "jsatominlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 using namespace js;
diff --git a/js/src/jit/MacroAssembler.cpp b/js/src/jit/MacroAssembler.cpp
index ba964d732f1d..e7964c66ada2 100644
--- a/js/src/jit/MacroAssembler.cpp
+++ b/js/src/jit/MacroAssembler.cpp
@@ -6,7 +6,6 @@
 
 #include "jit/MacroAssembler.h"
 
-#include "jsinfer.h"
 #include "jsprf.h"
 
 #include "builtin/TypedObject.h"
@@ -22,7 +21,6 @@
 #include "vm/TraceLogging.h"
 
 #include "jsgcinlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 #include "vm/Interpreter-inl.h"
 
diff --git a/js/src/jit/OptimizationTracking.h b/js/src/jit/OptimizationTracking.h
index c2dbb7735a09..aa656994d586 100644
--- a/js/src/jit/OptimizationTracking.h
+++ b/js/src/jit/OptimizationTracking.h
@@ -9,11 +9,11 @@
 
 #include "mozilla/Maybe.h"
 
-#include "jsinfer.h"
 #include "jit/CompactBuffer.h"
 #include "jit/CompileInfo.h"
 #include "jit/JitAllocPolicy.h"
 #include "js/TrackedOptimizationInfo.h"
+#include "vm/TypeInference.h"
 
 namespace js {
 
diff --git a/js/src/jit/VMFunctions.cpp b/js/src/jit/VMFunctions.cpp
index 9547c3db5abc..eb6c562a8bab 100644
--- a/js/src/jit/VMFunctions.cpp
+++ b/js/src/jit/VMFunctions.cpp
@@ -18,14 +18,13 @@
 #include "vm/Interpreter.h"
 #include "vm/TraceLogging.h"
 
-#include "jsinferinlines.h"
-
 #include "jit/BaselineFrame-inl.h"
 #include "jit/JitFrames-inl.h"
 #include "vm/Debugger-inl.h"
 #include "vm/Interpreter-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/StringObject-inl.h"
+#include "vm/TypeInference-inl.h"
 
 using namespace js;
 using namespace js::jit;
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 7211de669311..d5cde1785edc 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -88,7 +88,6 @@
 
 #include "jsatominlines.h"
 #include "jsfuninlines.h"
-#include "jsinferinlines.h"
 #include "jsscriptinlines.h"
 
 #include "vm/Interpreter-inl.h"
diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index 40d5034edeb7..70cb4baeb31d 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -28,7 +28,6 @@
 #include "jsatominlines.h"
 #include "jsfuninlines.h"
 #include "jsgcinlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 using namespace js;
diff --git a/js/src/jsiter.cpp b/js/src/jsiter.cpp
index 9123276a5596..53b84e13bb95 100644
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -33,8 +33,6 @@
 #include "vm/StopIterationObject.h"
 #include "vm/TypedArrayCommon.h"
 
-#include "jsinferinlines.h"
-#include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
 #include "vm/NativeObject-inl.h"
diff --git a/js/src/jsobjinlines.h b/js/src/jsobjinlines.h
index b02581847577..01e8d1c4019d 100644
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -22,7 +22,8 @@
 #include "jsatominlines.h"
 #include "jscompartmentinlines.h"
 #include "jsgcinlines.h"
-#include "jsinferinlines.h"
+
+#include "vm/TypeInference-inl.h"
 
 inline void
 JSObject::finalize(js::FreeOp *fop)
diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp
index 621a6d23c6a0..c37dc47bae3c 100644
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -39,7 +39,6 @@
 
 #include "jscntxtinlines.h"
 #include "jscompartmentinlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index f1da89afd6c0..9ee921c0aefb 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -47,7 +47,6 @@
 #include "vm/Xdr.h"
 
 #include "jsfuninlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 #include "vm/ScopeObject-inl.h"
diff --git a/js/src/jsstr.cpp b/js/src/jsstr.cpp
index ef843a257105..c08c4a2a47c2 100644
--- a/js/src/jsstr.cpp
+++ b/js/src/jsstr.cpp
@@ -44,11 +44,10 @@
 #include "vm/ScopeObject.h"
 #include "vm/StringBuffer.h"
 
-#include "jsinferinlines.h"
-
 #include "vm/Interpreter-inl.h"
 #include "vm/String-inl.h"
 #include "vm/StringObject-inl.h"
+#include "vm/TypeInference-inl.h"
 
 using namespace js;
 using namespace js::gc;
diff --git a/js/src/moz.build b/js/src/moz.build
index 93330b7028e2..adf79477aaa0 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -209,7 +209,6 @@ UNIFIED_SOURCES += [
     'jsfriendapi.cpp',
     'jsfun.cpp',
     'jsgc.cpp',
-    'jsinfer.cpp',
     'jsiter.cpp',
     'jsnativestack.cpp',
     'jsnum.cpp',
@@ -273,6 +272,7 @@ UNIFIED_SOURCES += [
     'vm/StructuredClone.cpp',
     'vm/Symbol.cpp',
     'vm/TypedArrayObject.cpp',
+    'vm/TypeInference.cpp',
     'vm/UbiNode.cpp',
     'vm/UnboxedObject.cpp',
     'vm/Unicode.cpp',
diff --git a/js/src/proxy/Proxy.cpp b/js/src/proxy/Proxy.cpp
index 7ccdead5398a..7e53e4c4ced5 100644
--- a/js/src/proxy/Proxy.cpp
+++ b/js/src/proxy/Proxy.cpp
@@ -20,7 +20,6 @@
 #include "vm/WrapperObject.h"
 
 #include "jsatominlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 #include "vm/NativeObject-inl.h"
diff --git a/js/src/vm/ArgumentsObject.cpp b/js/src/vm/ArgumentsObject.cpp
index 1b8762d7fadf..ee97dd6c47cb 100644
--- a/js/src/vm/ArgumentsObject.cpp
+++ b/js/src/vm/ArgumentsObject.cpp
@@ -6,8 +6,6 @@
 
 #include "vm/ArgumentsObject-inl.h"
 
-#include "jsinfer.h"
-
 #include "jit/JitFrames.h"
 #include "vm/GlobalObject.h"
 #include "vm/Stack.h"
diff --git a/js/src/vm/ArrayBufferObject.cpp b/js/src/vm/ArrayBufferObject.cpp
index 3734c1c33a9d..ea8f4a4d890d 100644
--- a/js/src/vm/ArrayBufferObject.cpp
+++ b/js/src/vm/ArrayBufferObject.cpp
@@ -45,8 +45,6 @@
 #include "vm/WrapperObject.h"
 
 #include "jsatominlines.h"
-#include "jsinferinlines.h"
-#include "jsobjinlines.h"
 
 #include "vm/NativeObject-inl.h"
 #include "vm/Shape-inl.h"
diff --git a/js/src/vm/ArrayObject-inl.h b/js/src/vm/ArrayObject-inl.h
index 380e517c1b97..8482854e6132 100644
--- a/js/src/vm/ArrayObject-inl.h
+++ b/js/src/vm/ArrayObject-inl.h
@@ -11,7 +11,7 @@
 
 #include "vm/String.h"
 
-#include "jsinferinlines.h"
+#include "vm/TypeInference-inl.h"
 
 namespace js {
 
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index 35810d435e69..21a998c2ba55 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -11,7 +11,6 @@
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jshashutil.h"
-#include "jsinfer.h"
 #include "jsnum.h"
 #include "jsobj.h"
 #include "jswrapper.h"
@@ -30,7 +29,6 @@
 #include "vm/WrapperObject.h"
 
 #include "jsgcinlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 #include "jsopcodeinlines.h"
 #include "jsscriptinlines.h"
diff --git a/js/src/vm/Interpreter-inl.h b/js/src/vm/Interpreter-inl.h
index 3c44be2e181f..4b958d27cb7f 100644
--- a/js/src/vm/Interpreter-inl.h
+++ b/js/src/vm/Interpreter-inl.h
@@ -10,7 +10,6 @@
 #include "vm/Interpreter.h"
 
 #include "jscompartment.h"
-#include "jsinfer.h"
 #include "jsnum.h"
 #include "jsstr.h"
 
@@ -18,7 +17,6 @@
 #include "vm/ArgumentsObject.h"
 
 #include "jsatominlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 #include "vm/ScopeObject-inl.h"
diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
index 4e722391d76b..1dbaab9f179f 100644
--- a/js/src/vm/Interpreter.cpp
+++ b/js/src/vm/Interpreter.cpp
@@ -43,7 +43,6 @@
 #include "jsatominlines.h"
 #include "jsboolinlines.h"
 #include "jsfuninlines.h"
-#include "jsinferinlines.h"
 #include "jsscriptinlines.h"
 
 #include "jit/JitFrames-inl.h"
diff --git a/js/src/vm/NativeObject.h b/js/src/vm/NativeObject.h
index 66bb7c1d0812..1c2f0629ae30 100644
--- a/js/src/vm/NativeObject.h
+++ b/js/src/vm/NativeObject.h
@@ -13,7 +13,6 @@
 #include <stdint.h>
 
 #include "jsfriendapi.h"
-#include "jsinfer.h"
 #include "jsobj.h"
 #include "NamespaceImports.h"
 
@@ -23,6 +22,7 @@
 #include "js/Value.h"
 #include "vm/Shape.h"
 #include "vm/String.h"
+#include "vm/TypeInference.h"
 
 namespace js {
 
diff --git a/js/src/vm/ObjectGroup.cpp b/js/src/vm/ObjectGroup.cpp
index 3243d46a0728..8e0ad58708b0 100644
--- a/js/src/vm/ObjectGroup.cpp
+++ b/js/src/vm/ObjectGroup.cpp
@@ -15,7 +15,6 @@
 #include "vm/UnboxedObject.h"
 
 #include "jsgcinlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 using namespace js;
diff --git a/js/src/vm/ObjectGroup.h b/js/src/vm/ObjectGroup.h
index 7db33e946522..3e8f446b797c 100644
--- a/js/src/vm/ObjectGroup.h
+++ b/js/src/vm/ObjectGroup.h
@@ -9,10 +9,10 @@
 
 #include "jsbytecode.h"
 #include "jsfriendapi.h"
-#include "jsinfer.h"
 
 #include "ds/IdValuePair.h"
 #include "gc/Barrier.h"
+#include "vm/TypeInference.h"
 
 namespace js {
 
diff --git a/js/src/vm/ProxyObject.cpp b/js/src/vm/ProxyObject.cpp
index 80c1424110d1..1f4d3650c9fa 100644
--- a/js/src/vm/ProxyObject.cpp
+++ b/js/src/vm/ProxyObject.cpp
@@ -8,7 +8,6 @@
 
 #include "jscompartment.h"
 #include "jsgcinlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 using namespace js;
diff --git a/js/src/vm/ScopeObject-inl.h b/js/src/vm/ScopeObject-inl.h
index 99558f37f46b..4b1188ff8e16 100644
--- a/js/src/vm/ScopeObject-inl.h
+++ b/js/src/vm/ScopeObject-inl.h
@@ -9,7 +9,7 @@
 
 #include "vm/ScopeObject.h"
 
-#include "jsinferinlines.h"
+#include "vm/TypeInference-inl.h"
 
 namespace js {
 
diff --git a/js/src/vm/SharedTypedArrayObject.cpp b/js/src/vm/SharedTypedArrayObject.cpp
index 617aa22e27c4..f7cbf7030d48 100644
--- a/js/src/vm/SharedTypedArrayObject.cpp
+++ b/js/src/vm/SharedTypedArrayObject.cpp
@@ -40,7 +40,6 @@
 #include "vm/WrapperObject.h"
 
 #include "jsatominlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 #include "vm/Shape-inl.h"
diff --git a/js/src/jsinferinlines.h b/js/src/vm/TypeInference-inl.h
similarity index 99%
rename from js/src/jsinferinlines.h
rename to js/src/vm/TypeInference-inl.h
index 81a8fa250669..0796c83edfdb 100644
--- a/js/src/jsinferinlines.h
+++ b/js/src/vm/TypeInference-inl.h
@@ -6,10 +6,10 @@
 
 /* Inline members for javascript type inference. */
 
-#ifndef jsinferinlines_h
-#define jsinferinlines_h
+#ifndef vm_TypeInference_inl_h
+#define vm_TypeInference_inl_h
 
-#include "jsinfer.h"
+#include "vm/TypeInference.h"
 
 #include "mozilla/PodOperations.h"
 
@@ -1142,4 +1142,4 @@ JSScript::ensureHasTypes(JSContext *cx)
     return types() || makeTypes(cx);
 }
 
-#endif /* jsinferinlines_h */
+#endif /* vm_TypeInference_inl_h */
diff --git a/js/src/jsinfer.cpp b/js/src/vm/TypeInference.cpp
similarity index 99%
rename from js/src/jsinfer.cpp
rename to js/src/vm/TypeInference.cpp
index d642120b57b5..6b4bcb16a55e 100644
--- a/js/src/jsinfer.cpp
+++ b/js/src/vm/TypeInference.cpp
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jsinferinlines.h"
+#include "vm/TypeInference-inl.h"
 
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MemoryReporting.h"
@@ -34,7 +34,6 @@
 
 #include "jsatominlines.h"
 #include "jsgcinlines.h"
-#include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
 #include "vm/NativeObject-inl.h"
diff --git a/js/src/jsinfer.h b/js/src/vm/TypeInference.h
similarity index 99%
rename from js/src/jsinfer.h
rename to js/src/vm/TypeInference.h
index 933f57ea61af..98e97c6f59ff 100644
--- a/js/src/jsinfer.h
+++ b/js/src/vm/TypeInference.h
@@ -6,8 +6,8 @@
 
 /* Definitions related to javascript type inference. */
 
-#ifndef jsinfer_h
-#define jsinfer_h
+#ifndef vm_TypeInference_h
+#define vm_TypeInference_h
 
 #include "mozilla/MemoryReporting.h"
 
@@ -421,8 +421,8 @@ class TypeSet
 
     /*
      * Iterate through the objects in this set. getObjectCount overapproximates
-     * in the hash case (see SET_ARRAY_SIZE in jsinferinlines.h), and getObject
-     * may return nullptr.
+     * in the hash case (see SET_ARRAY_SIZE in TypeInference-inl.h), and
+     * getObject may return nullptr.
      */
     inline unsigned getObjectCount() const;
     inline ObjectKey *getObject(unsigned i) const;
@@ -1232,4 +1232,4 @@ template<> struct Concrete<js::ObjectGroup> : TracerConcrete<js::ObjectGroup> {
 }
 }
 
-#endif /* jsinfer_h */
+#endif /* vm_TypeInference_h */
diff --git a/js/src/vm/TypedArrayObject.cpp b/js/src/vm/TypedArrayObject.cpp
index 45619273d4a5..548946722d24 100644
--- a/js/src/vm/TypedArrayObject.cpp
+++ b/js/src/vm/TypedArrayObject.cpp
@@ -39,8 +39,6 @@
 #include "vm/WrapperObject.h"
 
 #include "jsatominlines.h"
-#include "jsinferinlines.h"
-#include "jsobjinlines.h"
 
 #include "vm/NativeObject-inl.h"
 #include "vm/Shape-inl.h"
diff --git a/js/src/vm/UbiNode.cpp b/js/src/vm/UbiNode.cpp
index 2bbef9a0e0d9..d47c503ce256 100644
--- a/js/src/vm/UbiNode.cpp
+++ b/js/src/vm/UbiNode.cpp
@@ -12,7 +12,6 @@
 #include "mozilla/UniquePtr.h"
 
 #include "jscntxt.h"
-#include "jsinfer.h"
 #include "jsobj.h"
 #include "jsscript.h"
 #include "jsstr.h"
diff --git a/js/src/vm/UnboxedObject.cpp b/js/src/vm/UnboxedObject.cpp
index b64a9347e585..a0d27c437dd2 100644
--- a/js/src/vm/UnboxedObject.cpp
+++ b/js/src/vm/UnboxedObject.cpp
@@ -6,7 +6,6 @@
 
 #include "vm/UnboxedObject.h"
 
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 #include "vm/Shape-inl.h"
diff --git a/js/src/vm/UnboxedObject.h b/js/src/vm/UnboxedObject.h
index 37acecb39d98..2a54d2ef107e 100644
--- a/js/src/vm/UnboxedObject.h
+++ b/js/src/vm/UnboxedObject.h
@@ -8,9 +8,10 @@
 #define vm_UnboxedObject_h
 
 #include "jsgc.h"
-#include "jsinfer.h"
 #include "jsobj.h"
 
+#include "vm/TypeInference.h"
+
 namespace js {
 
 // Memory required for an unboxed value of a given type. Returns zero for types