diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
index 6af1d1e5888..5ded82f4d85 100644
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -1054,19 +1054,14 @@ typedef uint32_t JSArrayBufferViewType;
 /*
  * Create a new typed array with nelements elements.
  */
+JS_BEGIN_EXTERN_C
 
 extern JS_FRIEND_API(JSObject *)
 JS_NewInt8Array(JSContext *cx, uint32_t nelements);
 extern JS_FRIEND_API(JSObject *)
 JS_NewUint8Array(JSContext *cx, uint32_t nelements);
-
-JS_BEGIN_EXTERN_C
-
 extern JS_FRIEND_API(JSObject *)
 JS_NewUint8ClampedArray(JSContext *cx, uint32_t nelements);
-
-JS_END_EXTERN_C
-
 extern JS_FRIEND_API(JSObject *)
 JS_NewInt16Array(JSContext *cx, uint32_t nelements);
 extern JS_FRIEND_API(JSObject *)
@@ -1080,6 +1075,8 @@ JS_NewFloat32Array(JSContext *cx, uint32_t nelements);
 extern JS_FRIEND_API(JSObject *)
 JS_NewFloat64Array(JSContext *cx, uint32_t nelements);
 
+JS_END_EXTERN_C
+
 /*
  * Create a new typed array and copy in values from the given object. The
  * object is used as if it were an array; that is, the new array (if
@@ -1320,19 +1317,14 @@ JS_GetArrayBufferViewByteLength(JSObject *obj, JSContext *cx);
  * unwrapping will succeed. If cx is NULL, then DEBUG builds may be unable to
  * assert when unwrapping should be disallowed.
  */
+JS_BEGIN_EXTERN_C
 
 extern JS_FRIEND_API(int8_t *)
 JS_GetInt8ArrayData(JSObject *obj, JSContext *cx);
 extern JS_FRIEND_API(uint8_t *)
 JS_GetUint8ArrayData(JSObject *obj, JSContext *cx);
-
-JS_BEGIN_EXTERN_C
-
 extern JS_FRIEND_API(uint8_t *)
 JS_GetUint8ClampedArrayData(JSObject *obj, JSContext *cx);
-
-JS_END_EXTERN_C
-
 extern JS_FRIEND_API(int16_t *)
 JS_GetInt16ArrayData(JSObject *obj, JSContext *cx);
 extern JS_FRIEND_API(uint16_t *)
@@ -1346,6 +1338,8 @@ JS_GetFloat32ArrayData(JSObject *obj, JSContext *cx);
 extern JS_FRIEND_API(double *)
 JS_GetFloat64ArrayData(JSObject *obj, JSContext *cx);
 
+JS_END_EXTERN_C
+
 /*
  * Same as above, but for any kind of ArrayBufferView. Prefer the type-specific
  * versions when possible.