Bug 888088 (part 6) - Fix #include ordering in some of js/src/*.{h,cpp}. r=nnethercote.

--HG--
extra : rebase_source : bbf807155c1ed049a49cc2da73bbf55e0f334820

js/src/TraceLogging.cpp

@@ -5,12 +5,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "TraceLogging.h"
+
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
-#include <unistd.h>
-#include <string.h>
 #include <stdint.h>
+#include <string.h>
+#include <unistd.h>
 
 using namespace js;
 

js/src/jsanalyze.cpp

@@ -4,16 +4,15 @@
  * 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 "jsanalyze.h"
+#include "jsanalyzeinlines.h"
 
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/PodOperations.h"
 
-#include "jscompartment.h"
 #include "jscntxt.h"
+#include "jscompartment.h"
 
-#include "jsanalyzeinlines.h"
 #include "jsinferinlines.h"
 #include "jsopcodeinlines.h"
 

js/src/jsapi.cpp

@@ -20,9 +20,6 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include "jstypes.h"
-#include "jsutil.h"
-#include "jsprf.h"
 #include "jsarray.h"
 #include "jsatom.h"
 #include "jsbool.h"
@@ -38,29 +35,38 @@
 #include "jsmath.h"
 #include "jsnativestack.h"
 #include "jsnum.h"
-#include "json.h"
 #include "jsobj.h"
+#include "json.h"
+#include "jsprf.h"
 #include "jsproxy.h"
 #include "jsscript.h"
 #include "jsstr.h"
-#include "prmjtime.h"
+#include "jstypes.h"
+#include "jsutil.h"
 #include "jsweakmap.h"
-#include "jswrapper.h"
 #ifdef JS_THREADSAFE
 #include "jsworkers.h"
 #endif
+#include "jswrapper.h"
+#include "prmjtime.h"
 
+#if ENABLE_YARR_JIT
+#include "assembler/jit/ExecutableAllocator.h"
+#endif
 #include "builtin/Eval.h"
 #include "builtin/Intl.h"
 #include "builtin/MapObject.h"
-#include "builtin/RegExp.h"
 #include "builtin/ParallelArray.h"
+#include "builtin/RegExp.h"
 #include "frontend/BytecodeCompiler.h"
 #include "frontend/FullParseHandler.h"  // for JS_BufferIsCompileableUnit
 #include "frontend/Parser.h" // for JS_BufferIsCompileableUnit
 #include "gc/Marking.h"
 #include "gc/Memory.h"
 #include "ion/AsmJS.h"
+#ifdef JS_ION
+#include "ion/Ion.h"
+#endif
 #include "ion/PcScriptCache.h"
 #include "js/CharacterEncoding.h"
 #if ENABLE_INTL_API
@@ -91,14 +97,6 @@
 #include "vm/Shape-inl.h"
 #include "vm/String-inl.h"
 
-#if ENABLE_YARR_JIT
-#include "assembler/jit/ExecutableAllocator.h"
-#endif
-
-#ifdef JS_ION
-#include "ion/Ion.h"
-#endif
-
 using namespace js;
 using namespace js::gc;
 using namespace js::types;

js/src/jsarray.cpp

@@ -21,6 +21,7 @@
 #include "jsobj.h"
 #include "jstypes.h"
 #include "jsutil.h"
+
 #include "ds/Sort.h"
 #include "vm/ArgumentsObject.h"
 #include "vm/ForkJoin.h"
@@ -31,8 +32,8 @@
 
 #include "jsatominlines.h"
 
-#include "vm/ArrayObject-inl.h"
 #include "vm/ArgumentsObject-inl.h"
+#include "vm/ArrayObject-inl.h"
 #include "vm/Interpreter-inl.h"
 #include "vm/ObjectImpl-inl.h"
 #include "vm/Runtime-inl.h"

js/src/jsarray.h

@@ -9,8 +9,8 @@
 #ifndef jsarray_h
 #define jsarray_h
 
-#include "jspubtd.h"
 #include "jsobj.h"
+#include "jspubtd.h"
 
 namespace js {
 /* 2^32-2, inclusive */

js/src/jsatom.cpp

@@ -7,6 +7,7 @@
 /*
  * JS atom table.
  */
+
 #include "jsatominlines.h"
 
 #include "mozilla/RangedPtr.h"

js/src/jsatom.h

@@ -10,6 +10,7 @@
 #include "mozilla/HashFunctions.h"
 
 #include <stddef.h>
+
 #include "jsalloc.h"
 #include "jsapi.h"
 #include "jsprvtd.h"

js/src/jsatominlines.h

@@ -7,14 +7,16 @@
 #ifndef jsatominlines_h
 #define jsatominlines_h
 
+#include "jsatom.h"
+
 #include "mozilla/PodOperations.h"
 #include "mozilla/RangedPtr.h"
 
-#include "jsatom.h"
 #include "jscntxt.h"
 #include "jsnum.h"
 #include "jsobj.h"
 #include "jsstr.h"
+
 #include "gc/Barrier.h"
 #include "vm/String.h"
 

js/src/jsbool.cpp

@@ -8,20 +8,18 @@
  * JS boolean implementation.
  */
 
-#include "jsbool.h"
+#include "jsboolinlines.h"
 
-#include "jstypes.h"
 #include "jsapi.h"
 #include "jsatom.h"
 #include "jscntxt.h"
 #include "jsobj.h"
+#include "jstypes.h"
 
 #include "vm/GlobalObject.h"
 #include "vm/ProxyObject.h"
 #include "vm/StringBuffer.h"
 
-#include "jsboolinlines.h"
-
 #include "vm/BooleanObject-inl.h"
 
 using namespace js;

js/src/jsboolinlines.h

@@ -7,6 +7,8 @@
 #ifndef jsboolinlines_h
 #define jsboolinlines_h
 
+#include "jsbool.h"
+
 #include "mozilla/Assertions.h"
 #include "mozilla/Likely.h"
 

js/src/jsclass.h

@@ -12,6 +12,7 @@
  * js::Class is an engine-private extension that allows more control over
  * object behavior and, e.g., allows custom slow layout.
  */
+
 #include "jsapi.h"
 #include "jsprvtd.h"
 

js/src/jsclone.cpp

@@ -4,7 +4,6 @@
  * 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 "mozilla/Endian.h"
 /*
  * This file implements the structured clone algorithm of
  * http://www.whatwg.org/specs/web-apps/current-work/multipage/common-dom-interfaces.html#safe-passing-of-structured-data
@@ -31,6 +30,7 @@
 #include "jsclone.h"
 #include "jswrapper.h"
 
+#include "mozilla/Endian.h"
 #include "mozilla/FloatingPoint.h"
 
 #include "jsdate.h"

js/src/jscntxt.cpp

@@ -8,25 +8,21 @@
  * JS execution context.
  */
 
-#include "jscntxt.h"
+#include "jscntxtinlines.h"
+
+#include "mozilla/DebugOnly.h"
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/Util.h"
 
 #include <locale.h>
 #include <stdarg.h>
 #include <string.h>
-
-#include "mozilla/DebugOnly.h"
-
 #ifdef ANDROID
 # include <android/log.h>
 # include <fstream>
 # include <string>
 #endif  // ANDROID
 
-#include "mozilla/MemoryReporting.h"
-#include "mozilla/Util.h"
-
-#include "jstypes.h"
-#include "jsprf.h"
 #include "jsatom.h"
 #include "jscompartment.h"
 #include "jsdbgapi.h"
@@ -37,21 +33,22 @@
 #include "jsmath.h"
 #include "jsobj.h"
 #include "jsopcode.h"
+#include "jsprf.h"
 #include "jspubtd.h"
 #include "jsscript.h"
 #include "jsstr.h"
+#include "jstypes.h"
 #include "jsworkers.h"
+
+#include "gc/Marking.h"
 #ifdef JS_ION
 #include "ion/Ion.h"
 #endif
-
-#include "gc/Marking.h"
 #include "js/CharacterEncoding.h"
 #include "js/MemoryMetrics.h"
 #include "vm/Shape.h"
 #include "yarr/BumpPointerAllocator.h"
 
-#include "jscntxtinlines.h"
 #include "jsobjinlines.h"
 
 #include "vm/Stack-inl.h"

js/src/jscompartment.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 "jscompartment.h"
+#include "jscompartmentinlines.h"
 
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MemoryReporting.h"

js/src/jscrashreport.cpp

@@ -80,9 +80,9 @@ GetStack(uint64_t *stack, uint64_t *stack_len, CrashRegisters *regs, char *buffe
 
 #elif 0
 
-#include <unistd.h>
-#include <ucontext.h>
 #include <sys/mman.h>
+#include <ucontext.h>
+#include <unistd.h>
 
 static bool
 GetStack(uint64_t *stack, uint64_t *stack_len, CrashRegisters *regs, char *buffer, size_t size)

js/src/jsdate.cpp

@@ -26,15 +26,15 @@
 #include <math.h>
 #include <string.h>
 
-#include "jstypes.h"
-#include "jsprf.h"
-#include "prmjtime.h"
-#include "jsutil.h"
 #include "jsapi.h"
 #include "jscntxt.h"
 #include "jsnum.h"
 #include "jsobj.h"
+#include "jsprf.h"
 #include "jsstr.h"
+#include "jstypes.h"
+#include "jsutil.h"
+#include "prmjtime.h"
 
 #include "vm/DateTime.h"
 #include "vm/GlobalObject.h"

js/src/jsdbgapi.cpp

@@ -12,27 +12,26 @@
 
 #include <string.h>
 
-#include "jsprvtd.h"
-#include "jstypes.h"
 #include "jsapi.h"
 #include "jscntxt.h"
 #include "jsfun.h"
 #include "jsgc.h"
 #include "jsobj.h"
 #include "jsopcode.h"
+#include "jsprvtd.h"
 #include "jsscript.h"
 #include "jsstr.h"
+#include "jstypes.h"
 #include "jswatchpoint.h"
 
 #include "frontend/SourceNotes.h"
 #include "ion/AsmJS.h"
-#include "vm/Debugger.h"
-#include "vm/Interpreter.h"
-#include "vm/Shape.h"
-
 #ifdef JS_ION
 #include "ion/AsmJSModule.h"
 #endif
+#include "vm/Debugger.h"
+#include "vm/Interpreter.h"
+#include "vm/Shape.h"
 
 #include "jsatominlines.h"
 #include "jsinferinlines.h"

js/src/jsdbgapi.h

@@ -9,6 +9,7 @@
 /*
  * JS debugger API.
  */
+
 #include "jsprvtd.h"
 
 namespace JS {

js/src/jsdtoa.cpp

@@ -7,10 +7,11 @@
 /*
  * Portable double to alphanumeric string and back converters.
  */
+
 #include "jsdtoa.h"
 
-#include "jstypes.h"
 #include "jsprf.h"
+#include "jstypes.h"
 #include "jsutil.h"
 
 using namespace js;

js/src/jsdtoa.h

@@ -10,6 +10,7 @@
  * Public interface to portable double-precision floating point to string
  * and back conversion package.
  */
+
 #include <stddef.h>
 
 struct DtoaState;

js/src/jsexn.cpp

@@ -7,21 +7,22 @@
 /*
  * JS standard exception implementation.
  */
-#include "jsexn.h"
 
-#include <string.h>
+#include "jsexn.h"
 
 #include "mozilla/PodOperations.h"
 #include "mozilla/Util.h"
 
-#include "jstypes.h"
-#include "jsutil.h"
+#include <string.h>
+
 #include "jsapi.h"
 #include "jscntxt.h"
 #include "jsfun.h"
 #include "jsnum.h"
 #include "jsobj.h"
 #include "jsscript.h"
+#include "jstypes.h"
+#include "jsutil.h"
 #include "jswrapper.h"
 
 #include "gc/Marking.h"

js/src/jsfriendapi.cpp

@@ -13,9 +13,9 @@
 #include "jscompartment.h"
 #include "jsgc.h"
 #include "jsobj.h"
-#include "jswrapper.h"
-#include "jsweakmap.h"
 #include "jswatchpoint.h"
+#include "jsweakmap.h"
+#include "jswrapper.h"
 #include "prmjtime.h"
 
 #include "builtin/TestingFunctions.h"

js/src/jsfriendapi.h

@@ -10,8 +10,8 @@
 #include "mozilla/MemoryReporting.h"
 
 #include "jsclass.h"
-#include "jspubtd.h"
 #include "jsprvtd.h"
+#include "jspubtd.h"
 
 #include "js/CallArgs.h"
 

js/src/jsfun.cpp

@@ -7,14 +7,14 @@
 /*
  * JS function support.
  */
-#include "jsfun.h"
 
-#include <string.h>
+#include "jsfuninlines.h"
 
 #include "mozilla/PodOperations.h"
 #include "mozilla/Util.h"
 
-#include "jstypes.h"
+#include <string.h>
+
 #include "jsapi.h"
 #include "jsarray.h"
 #include "jsatom.h"
@@ -23,29 +23,28 @@
 #include "jsproxy.h"
 #include "jsscript.h"
 #include "jsstr.h"
+#include "jstypes.h"
 #include "jswrapper.h"
 
 #include "builtin/Eval.h"
 #include "frontend/BytecodeCompiler.h"
 #include "frontend/TokenStream.h"
 #include "gc/Marking.h"
+#ifdef JS_ION
+#include "ion/Ion.h"
+#include "ion/IonFrameIterator.h"
+#endif
 #include "vm/Interpreter.h"
 #include "vm/Shape.h"
 #include "vm/StringBuffer.h"
 #include "vm/WrapperObject.h"
 #include "vm/Xdr.h"
 
-#include "jsfuninlines.h"
 #include "jsscriptinlines.h"
 
 #include "vm/Interpreter-inl.h"
 #include "vm/Stack-inl.h"
 
-#ifdef JS_ION
-#include "ion/Ion.h"
-#include "ion/IonFrameIterator.h"
-#endif
-
 using namespace js;
 using namespace js::gc;
 using namespace js::types;

js/src/jsfun.h

@@ -9,8 +9,9 @@
 /*
  * JS function definitions.
  */
-#include "jsprvtd.h"
+
 #include "jsobj.h"
+#include "jsprvtd.h"
 #include "jsscript.h"
 
 #include "gc/Barrier.h"

js/src/jsgc.cpp

@@ -6,15 +6,13 @@
 
 /* JS Mark-and-Sweep Garbage Collector. */
 
-#include "jsgc.h"
+#include "jsgcinlines.h"
 
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Move.h"
 #include "mozilla/Util.h"
 
-#include "prmjtime.h"
-
 using mozilla::Swap;
 
 /*
@@ -47,50 +45,49 @@ using mozilla::Swap;
  */
 
 #include <string.h>     /* for memset used when DEBUG */
+#ifndef XP_WIN
+# include <unistd.h>
+#endif
 
-#include "jstypes.h"
-#include "jsutil.h"
 #include "jsapi.h"
 #include "jsatom.h"
-#include "jscompartment.h"
 #include "jscntxt.h"
+#include "jscompartment.h"
 #include "jsobj.h"
 #include "jsproxy.h"
 #include "jsscript.h"
+#include "jstypes.h"
+#include "jsutil.h"
 #include "jswatchpoint.h"
 #include "jsweakmap.h"
+#ifdef XP_WIN
+# include "jswin.h"
+#endif
+#include "prmjtime.h"
+#if JS_TRACE_LOGGING
+#include "TraceLogging.h"
+#endif
 
 #include "gc/FindSCCs.h"
 #include "gc/GCInternals.h"
 #include "gc/Marking.h"
 #include "gc/Memory.h"
-#include "vm/Debugger.h"
-#include "vm/ProxyObject.h"
-#include "vm/Shape.h"
-#include "vm/String.h"
-#include "vm/ForkJoin.h"
-#include "vm/WrapperObject.h"
-#include "ion/IonCode.h"
 #ifdef JS_ION
 # include "ion/BaselineJIT.h"
 #endif
+#include "ion/IonCode.h"
+#include "vm/Debugger.h"
+#include "vm/ForkJoin.h"
+#include "vm/ProxyObject.h"
+#include "vm/Shape.h"
+#include "vm/String.h"
+#include "vm/WrapperObject.h"
 
-#include "jsgcinlines.h"
 #include "jsobjinlines.h"
 
-#include "vm/String-inl.h"
 #include "vm/Runtime-inl.h"
 #include "vm/Stack-inl.h"
-
-#ifdef XP_WIN
-# include "jswin.h"
-#else
-# include <unistd.h>
-#endif
-
-#if JS_TRACE_LOGGING
-#include "TraceLogging.h"
-#endif
+#include "vm/String-inl.h"
 
 using namespace js;
 using namespace js::gc;

js/src/jsgcinlines.h

@@ -8,13 +8,14 @@
 #define jsgcinlines_h
 
 #include "jsgc.h"
+
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jslock.h"
 
 #include "js/RootingAPI.h"
-#include "vm/Shape.h"
 #include "vm/ForkJoin.h"
+#include "vm/Shape.h"
 
 namespace js {
 

js/src/jsinfer.cpp

@@ -4,43 +4,42 @@
  * 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 "jsinfer.h"
+#include "jsinferinlines.h"
 
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/PodOperations.h"
 
+#ifdef __SUNPRO_CC
+#include <alloca.h>
+#endif
+
 #include "jsapi.h"
+#include "jscntxt.h"
 #include "jsfriendapi.h"
 #include "jsgc.h"
 #include "jsobj.h"
 #include "jsscript.h"
-#include "jscntxt.h"
 #include "jsstr.h"
 #include "jsworkers.h"
 #include "prmjtime.h"
 
+#include "gc/Marking.h"
 #ifdef JS_ION
 #include "ion/BaselineJIT.h"
 #include "ion/Ion.h"
 #include "ion/IonCompartment.h"
 #endif
-#include "gc/Marking.h"
 #include "js/MemoryMetrics.h"
 #include "vm/Shape.h"
 
 #include "jsanalyzeinlines.h"
 #include "jsatominlines.h"
 #include "jsgcinlines.h"
-#include "jsinferinlines.h"
-#include "jsopcodeinlines.h"
 #include "jsobjinlines.h"
+#include "jsopcodeinlines.h"
 #include "jsscriptinlines.h"
 
-#ifdef __SUNPRO_CC
-#include <alloca.h>
-#endif
-
 using namespace js;
 using namespace js::gc;
 using namespace js::types;

js/src/jsinferinlines.h

@@ -9,13 +9,14 @@
 #ifndef jsinferinlines_h
 #define jsinferinlines_h
 
+#include "jsinfer.h"
+
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/PodOperations.h"
 
-#include "jsarray.h"
 #include "jsanalyze.h"
+#include "jsarray.h"
 #include "jscompartment.h"
-#include "jsinfer.h"
 #include "jsprf.h"
 #include "jsproxy.h"
 

js/src/jsiter.cpp

@@ -12,8 +12,6 @@
 #include "mozilla/PodOperations.h"
 #include "mozilla/Util.h"
 
-#include "jstypes.h"
-#include "jsutil.h"
 #include "jsapi.h"
 #include "jsarray.h"
 #include "jsatom.h"
@@ -23,6 +21,8 @@
 #include "jsopcode.h"
 #include "jsproxy.h"
 #include "jsscript.h"
+#include "jstypes.h"
+#include "jsutil.h"
 
 #include "ds/Sort.h"
 #include "gc/Marking.h"

js/src/jslibmath.h

@@ -10,6 +10,7 @@
 #include "mozilla/FloatingPoint.h"
 
 #include <math.h>
+
 #include "jsnum.h"
 
 /*

js/src/jslock.h

@@ -7,15 +7,14 @@
 #ifndef jslock_h
 #define jslock_h
 
-#include "jsapi.h"
-
 #ifdef JS_THREADSAFE
 
+# include "jsapi.h"
 # include "pratom.h"
-# include "prlock.h"
 # include "prcvar.h"
-# include "prthread.h"
 # include "prinit.h"
+# include "prlock.h"
+# include "prthread.h"
 
 # define JS_ATOMIC_INCREMENT(p)      PR_ATOMIC_INCREMENT((int32_t *)(p))
 # define JS_ATOMIC_DECREMENT(p)      PR_ATOMIC_DECREMENT((int32_t *)(p))

js/src/jsmath.cpp

@@ -15,8 +15,6 @@
 
 #include "jsmath.h"
 
-#include "jslibmath.h"
-
 #include "mozilla/Constants.h"
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/MathAlgorithms.h"
@@ -29,12 +27,13 @@
 # include <unistd.h>
 #endif
 
-#include "jstypes.h"
-#include "prmjtime.h"
 #include "jsapi.h"
 #include "jsatom.h"
 #include "jscntxt.h"
 #include "jscompartment.h"
+#include "jslibmath.h"
+#include "jstypes.h"
+#include "prmjtime.h"
 
 #include "jsobjinlines.h"
 

js/src/jsnativestack.cpp

@@ -21,8 +21,8 @@
 # endif
 
 # if defined(ANDROID)
-#  include <unistd.h>
 #  include <sys/types.h>
+#  include <unistd.h>
 # endif
 
 #else

js/src/jsnum.cpp

@@ -14,24 +14,25 @@
 #include "mozilla/PodOperations.h"
 #include "mozilla/RangedPtr.h"
 
-#include "double-conversion.h"
-
 #ifdef XP_OS2
 #define _PC_53  PC_53
 #define _MCW_EM MCW_EM
 #define _MCW_PC MCW_PC
 #endif
+
 #include <locale.h>
 #include <math.h>
 #include <string.h>
 
-#include "jstypes.h"
+#include "double-conversion.h"
 #include "jsapi.h"
 #include "jsatom.h"
 #include "jscntxt.h"
 #include "jsdtoa.h"
 #include "jsobj.h"
 #include "jsstr.h"
+#include "jstypes.h"
+
 #include "vm/GlobalObject.h"
 #include "vm/NumericConversions.h"
 #include "vm/StringBuffer.h"

js/src/jsobj.cpp

@@ -7,33 +7,35 @@
 /*
  * JS object implementation.
  */
-#include "jsobjinlines.h"
 
-#include <string.h>
+#include "jsobjinlines.h"
 
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/TemplateLib.h"
 #include "mozilla/Util.h"
 
-#include "jstypes.h"
-#include "jsutil.h"
-#include "jsprf.h"
+#include <string.h>
+
 #include "jsapi.h"
 #include "jsarray.h"
 #include "jsatom.h"
 #include "jscntxt.h"
+#include "jsdbgapi.h"
 #include "jsfun.h"
 #include "jsgc.h"
 #include "jsiter.h"
 #include "jsnum.h"
 #include "jsopcode.h"
+#include "jsprf.h"
 #include "jsproxy.h"
 #include "jsscript.h"
 #include "jsstr.h"
-#include "jsdbgapi.h"
+#include "jstypes.h"
+#include "jsutil.h"
 #include "jswatchpoint.h"
 #include "jswrapper.h"
+
 #include "frontend/BytecodeCompiler.h"
 #include "gc/Marking.h"
 #include "ion/BaselineJIT.h"

js/src/jsobj.h

@@ -25,7 +25,6 @@
 
 #include "gc/Barrier.h"
 #include "gc/Heap.h"
-
 #include "vm/ObjectImpl.h"
 #include "vm/Shape.h"
 #include "vm/String.h"

js/src/json.cpp

@@ -9,6 +9,7 @@
 #include "mozilla/FloatingPoint.h"
 
 #include <string.h>
+
 #include "jsapi.h"
 #include "jsarray.h"
 #include "jsatom.h"

js/src/vm/BooleanObject.h

@@ -8,6 +8,7 @@
 #define vm_BooleanObject_h
 
 #include "jsbool.h"
+#include "jsobj.h"
 
 namespace js {
 

js/src/vm/Monitor.h

@@ -7,6 +7,8 @@
 #ifndef vm_Monitor_h
 #define vm_Monitor_h
 
+#include <stddef.h>
+
 #include "jslock.h"
 
 namespace js {