--- a/content/base/src/nsDOMDataChannel.cpp
+++ b/content/base/src/nsDOMDataChannel.cpp
@@ -21,17 +21,17 @@ extern PRLogModuleInfo* GetDataChannelLo
 #include "nsDOMDataChannel.h"
 #include "nsIDOMFile.h"
 #include "nsIJSNativeInitializer.h"
 #include "nsIDOMDataChannel.h"
 #include "nsIDOMMessageEvent.h"
 #include "nsDOMClassInfo.h"
 #include "nsDOMEventTargetHelper.h"
 
-#include "jsval.h"
+#include "js/Value.h"
 
 #include "nsError.h"
 #include "nsAutoPtr.h"
 #include "nsContentUtils.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsJSUtils.h"
 #include "nsNetUtil.h"

--- a/js/src/gdb/mozilla/jsval.py
+++ b/js/src/gdb/mozilla/jsval.py
@@ -67,22 +67,22 @@ mozilla.prettyprinters.clear_module_prin
 # an address are significant, and only those values whose top bit is zero
 # are used for user-space addresses. This means that x86_64 addresses are
 # effectively 47 bits long, and thus fit nicely in the available portion of
 # the fraction field.
 #
 #
 # In detail:
 #
-# - jsval (jsapi.h) is a typedef for JS::Value.
+# - jsval (Value.h) is a typedef for JS::Value.
 #
-# - JS::Value (jsapi.h) is a class with a lot of methods and a single data
+# - JS::Value (Value.h) is a class with a lot of methods and a single data
 #   member, of type jsval_layout.
 #
-# - jsval_layout (jsval.h) is a helper type for picking apart values. This
+# - jsval_layout (Value.h) is a helper type for picking apart values. This
 #   is always 64 bits long, with a variant for each address size (32 bits
 #   or 64 bits) and endianness (little- or big-endian).
 #
 #   jsval_layout is a union with 'asBits', 'asDouble', and 'asPtr'
 #   branches, and an 's' branch, which is a struct that tries to break out
 #   the bitfields a little for the non-double types. On 64-bit machines,
 #   jsval_layout also has an 'asUIntPtr' branch.
 #

--- a/js/src/jsnum.cpp
+++ b/js/src/jsnum.cpp
@@ -1023,17 +1023,17 @@ bool
 js::InitRuntimeNumberState(JSRuntime *rt)
 {
     FIX_FPU();
 
     double d;
 
     /*
      * Our NaN must be one particular canonical value, because we rely on NaN
-     * encoding for our value representation.  See jsval.h.
+     * encoding for our value representation.  See Value.h.
      */
     d = MOZ_DOUBLE_SPECIFIC_NaN(0, 0x8000000000000ULL);
     number_constants[NC_NaN].dval = js_NaN = d;
     rt->NaNValue.setDouble(d);
 
     d = MOZ_DOUBLE_POSITIVE_INFINITY();
     number_constants[NC_POSITIVE_INFINITY].dval = js_PositiveInfinity = d;
     rt->positiveInfinityValue.setDouble(d);