diff --git a/js/src/jsgcchunk.h b/js/src/jsgcchunk.h
index 0a5962d1862..c4fb9236226 100644
--- a/js/src/jsgcchunk.h
+++ b/js/src/jsgcchunk.h
@@ -40,7 +40,6 @@
 #ifndef jsgchunk_h__
 #define jsgchunk_h__
 
-#include "jsapi.h"
 #include "jsprvtd.h"
 #include "jsutil.h"
 
@@ -55,10 +54,6 @@ const size_t GC_CHUNK_SHIFT = 20;
 const size_t GC_CHUNK_SIZE = size_t(1) << GC_CHUNK_SHIFT;
 const size_t GC_CHUNK_MASK = GC_CHUNK_SIZE - 1;
 
-#if defined(XP_WIN) && defined(_M_X64)
-bool InitNtAllocAPIs();
-#endif
-
 JS_FRIEND_API(void *)
 AllocGCChunk();
 
diff --git a/js/src/jsinterp.h b/js/src/jsinterp.h
index 495bcafe488..2f102c0ee07 100644
--- a/js/src/jsinterp.h
+++ b/js/src/jsinterp.h
@@ -86,12 +86,12 @@ struct JSStackFrame
     JSObject            *callobj;       /* lazily created Call object */
     JSObject            *argsobj;       /* lazily created arguments object */
     JSScript            *script;        /* script being interpreted */
-    JSFunction          *fun;           /* function being called or null */
     js::Value           thisv;          /* "this" pointer if in method */
+    JSFunction          *fun;           /* function being called or null */
     uintN               argc;           /* actual argument count */
     js::Value           *argv;          /* base of argument stack slots */
-    js::Value           rval;           /* function return value */
     void                *annotation;    /* used by Java security */
+    js::Value           rval;           /* function return value */
 
     /* Maintained by StackSpace operations */
     JSStackFrame        *down;          /* previous frame, part of
diff --git a/js/src/jsxdrapi.h b/js/src/jsxdrapi.h
index 73267178066..a3eeea67fe3 100644
--- a/js/src/jsxdrapi.h
+++ b/js/src/jsxdrapi.h
@@ -205,7 +205,7 @@ JS_XDRFindClassById(JSXDRState *xdr, uint32 id);
  * before deserialization of bytecode.  If the saved version does not match
  * the current version, abort deserialization and invalidate the file.
  */
-#define JSXDR_BYTECODE_VERSION      (0xb973c0de - 64)
+#define JSXDR_BYTECODE_VERSION      (0xb973c0de - 65)
 
 /*
  * Library-private functions.
diff --git a/modules/plugin/base/src/nsNPAPIPlugin.h b/modules/plugin/base/src/nsNPAPIPlugin.h
index 5a043dfaaa7..399303e6728 100644
--- a/modules/plugin/base/src/nsNPAPIPlugin.h
+++ b/modules/plugin/base/src/nsNPAPIPlugin.h
@@ -116,12 +116,6 @@ namespace mozilla {
 namespace plugins {
 namespace parent {
 
-// On 32-bit platforms, sizeof(jsval) != sizeof(NPIdentifier), so we need to
-// use an alternate encoding scheme. The following inline helpers provide an
-// abstraction for setting and getting the values of NPIdentifiers that should
-// always be used instead of casting an NPIdentifier to a jsval and using the
-// jsapi.
-
 JS_STATIC_ASSERT(sizeof(NPIdentifier) == sizeof(jsid));
 
 static inline jsid