diff --git a/js/src/builtin/Eval.cpp b/js/src/builtin/Eval.cpp
index 5fd8fcea2c0..760a9339824 100644
--- a/js/src/builtin/Eval.cpp
+++ b/js/src/builtin/Eval.cpp
@@ -10,10 +10,10 @@
 #include "mozilla/Range.h"
 
 #include "jscntxt.h"
-#include "jsonparser.h"
 
 #include "frontend/BytecodeCompiler.h"
 #include "vm/GlobalObject.h"
+#include "vm/JSONParser.h"
 
 #include "vm/Interpreter-inl.h"
 
diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp
index b23941ce97f..99208772dd7 100644
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -12,7 +12,6 @@
 
 #include "jscntxt.h"
 #include "jsgc.h"
-#include "jsonparser.h"
 #include "jsprf.h"
 #include "jstypes.h"
 #include "jswatchpoint.h"
@@ -25,6 +24,7 @@
 #include "jit/IonMacroAssembler.h"
 #include "js/HashTable.h"
 #include "vm/Debugger.h"
+#include "vm/JSONParser.h"
 #include "vm/PropDesc.h"
 
 #include "jsgcinlines.h"
diff --git a/js/src/json.cpp b/js/src/json.cpp
index 3e5f1cff8bd..a3932c5ffb8 100644
--- a/js/src/json.cpp
+++ b/js/src/json.cpp
@@ -14,12 +14,12 @@
 #include "jscntxt.h"
 #include "jsnum.h"
 #include "jsobj.h"
-#include "jsonparser.h"
 #include "jsstr.h"
 #include "jstypes.h"
 #include "jsutil.h"
 
 #include "vm/Interpreter.h"
+#include "vm/JSONParser.h"
 #include "vm/StringBuffer.h"
 
 #include "jsatominlines.h"
diff --git a/js/src/moz.build b/js/src/moz.build
index 8c7f51b61ea..1bb2f001def 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -215,7 +215,6 @@ UNIFIED_SOURCES += [
     'jsnum.cpp',
     'jsobj.cpp',
     'json.cpp',
-    'jsonparser.cpp',
     'jsopcode.cpp',
     'jsprf.cpp',
     'jspropertytree.cpp',
@@ -249,6 +248,7 @@ UNIFIED_SOURCES += [
     'vm/HelperThreads.cpp',
     'vm/Id.cpp',
     'vm/Interpreter.cpp',
+    'vm/JSONParser.cpp',
     'vm/MemoryMetrics.cpp',
     'vm/Monitor.cpp',
     'vm/ObjectImpl.cpp',
diff --git a/js/src/jsonparser.cpp b/js/src/vm/JSONParser.cpp
similarity index 99%
rename from js/src/jsonparser.cpp
rename to js/src/vm/JSONParser.cpp
index 125960e7b36..f318a7629bc 100644
--- a/js/src/jsonparser.cpp
+++ b/js/src/vm/JSONParser.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 "jsonparser.h"
+#include "vm/JSONParser.h"
 
 #include "mozilla/Range.h"
 #include "mozilla/RangedPtr.h"
diff --git a/js/src/jsonparser.h b/js/src/vm/JSONParser.h
similarity index 98%
rename from js/src/jsonparser.h
rename to js/src/vm/JSONParser.h
index 24c4b7d02a0..faf75aa4598 100644
--- a/js/src/jsonparser.h
+++ b/js/src/vm/JSONParser.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef jsonparser_h
-#define jsonparser_h
+#ifndef vm_JSONParser_h
+#define vm_JSONParser_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/Range.h"
@@ -237,4 +237,4 @@ class MOZ_STACK_CLASS JSONParser : public JSONParserBase
 
 } /* namespace js */
 
-#endif /* jsonparser_h */
+#endif /* vm_JSONParser_h */