diff --git a/js/src/gc/Root.h b/js/public/RootingAPI.h
similarity index 100%
rename from js/src/gc/Root.h
rename to js/public/RootingAPI.h
diff --git a/js/public/Value.h b/js/public/Value.h
index f01f8dff7b6a..61d6b0431016 100644
--- a/js/public/Value.h
+++ b/js/public/Value.h
@@ -16,8 +16,8 @@
 
 #include <limits> /* for std::numeric_limits */
 
-#include "gc/Root.h"
 #include "js/Anchor.h"
+#include "js/RootingAPI.h"
 #include "js/Utility.h"
 
 namespace JS { class Value; }
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index f7e458393579..29d5f70bc949 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -176,16 +176,12 @@ INSTALLED_HEADERS = \
 # BEGIN exported headers that are only exported
 #       because of inclusion by an INSTALLED_HEADER
 #
-EXPORTS_NAMESPACES += ds gc
+EXPORTS_NAMESPACES += ds
 
 EXPORTS_ds = \
 		BitArray.h \
 		$(NULL)
 
-EXPORTS_gc = \
-		Root.h \
-		$(NULL)
-
 ######################################################
 # BEGIN include exported headers from the JS engine
 #
@@ -212,6 +208,7 @@ EXPORTS_js = \
 		MemoryMetrics.h \
 		PropertyKey.h \
 		RequiredDefines.h \
+		RootingAPI.h \
 		TemplateLib.h \
 		Utility.h \
 		Value.h \
diff --git a/js/src/assembler/assembler/AssemblerBuffer.h b/js/src/assembler/assembler/AssemblerBuffer.h
index 233e990f49d6..d21182527b52 100644
--- a/js/src/assembler/assembler/AssemblerBuffer.h
+++ b/js/src/assembler/assembler/AssemblerBuffer.h
@@ -43,9 +43,9 @@
 #include "jsfriendapi.h"
 #include "jsopcode.h"
 
-#include "gc/Root.h"
-#include "methodjit/Logging.h"
 #include "ion/IonSpewer.h"
+#include "js/RootingAPI.h"
+#include "methodjit/Logging.h"
 
 #define PRETTY_PRINT_OFFSET(os) (((os)<0)?"-":""), (((os)<0)?-(os):(os))
 
diff --git a/js/src/builtin/Intl.h b/js/src/builtin/Intl.h
index 153ebfe4554e..9998cbd45315 100644
--- a/js/src/builtin/Intl.h
+++ b/js/src/builtin/Intl.h
@@ -7,7 +7,7 @@
 #ifndef Intl_h___
 #define Intl_h___
 
-#include "gc/Root.h"
+#include "js/RootingAPI.h"
 
 struct JSContext;
 class JSObject;
diff --git a/js/src/gc/Barrier.h b/js/src/gc/Barrier.h
index 3904333244c6..7d3ab0868451 100644
--- a/js/src/gc/Barrier.h
+++ b/js/src/gc/Barrier.h
@@ -11,8 +11,8 @@
 #include "jsapi.h"
 
 #include "gc/Heap.h"
-#include "gc/Root.h"
 #include "js/HashTable.h"
+#include "js/RootingAPI.h"
 
 /*
  * A write barrier is a mechanism used by incremental or generation GCs to
diff --git a/js/src/ion/C1Spewer.h b/js/src/ion/C1Spewer.h
index 92a7888a574f..fe05132a9407 100644
--- a/js/src/ion/C1Spewer.h
+++ b/js/src/ion/C1Spewer.h
@@ -10,9 +10,10 @@
 #ifndef jsion_c1spewer_h__
 #define jsion_c1spewer_h__
 
-#include "gc/Root.h"
 #include "jsscript.h"
 
+#include "js/RootingAPI.h"
+
 namespace js {
 namespace ion {
 
diff --git a/js/src/ion/CompilerRoot.h b/js/src/ion/CompilerRoot.h
index ccbfdb66651a..81e9386ac417 100644
--- a/js/src/ion/CompilerRoot.h
+++ b/js/src/ion/CompilerRoot.h
@@ -9,7 +9,8 @@
 #define jsion_ion_gc_h__
 
 #include "jscntxt.h"
-#include "gc/Root.h"
+
+#include "js/RootingAPI.h"
 
 namespace js {
 namespace ion {
diff --git a/js/src/ion/IonMacroAssembler.cpp b/js/src/ion/IonMacroAssembler.cpp
index 01ab8117911f..eedc68d6722e 100644
--- a/js/src/ion/IonMacroAssembler.cpp
+++ b/js/src/ion/IonMacroAssembler.cpp
@@ -6,12 +6,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "jsinfer.h"
-#include "jsinferinlines.h"
-#include "IonMacroAssembler.h"
-#include "gc/Root.h"
-#include "Bailouts.h"
+
+#include "ion/Bailouts.h"
+#include "ion/IonMacroAssembler.h"
+#include "js/RootingAPI.h"
 #include "vm/ForkJoin.h"
 
+#include "jsinferinlines.h"
+
 using namespace js;
 using namespace js::ion;
 
diff --git a/js/src/ion/JSONSpewer.h b/js/src/ion/JSONSpewer.h
index 887b18477982..8726b48fcd26 100644
--- a/js/src/ion/JSONSpewer.h
+++ b/js/src/ion/JSONSpewer.h
@@ -10,9 +10,10 @@
 
 #include <stdio.h>
 
-#include "gc/Root.h"
 #include "jsscript.h"
 
+#include "js/RootingAPI.h"
+
 class JSScript;
 
 namespace js {
diff --git a/js/src/jsapi-tests/tests.cpp b/js/src/jsapi-tests/tests.cpp
index 11fcdfd255ad..6ce8c30b6244 100644
--- a/js/src/jsapi-tests/tests.cpp
+++ b/js/src/jsapi-tests/tests.cpp
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "tests.h"
-#include "gc/Root.h"
+#include "js/RootingAPI.h"
 #include "jsobj.h"
 #include <stdio.h>
 
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index a8b78ed28861..05b6012c45f0 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -25,11 +25,11 @@
 #include "jspubtd.h"
 #include "jsutil.h"
 
-#include "gc/Root.h"
 #include "js/Anchor.h"
 #include "js/CharacterEncoding.h"
 #include "js/HashTable.h"
 #include "js/PropertyKey.h"
+#include "js/RootingAPI.h"
 #include "js/Utility.h"
 #include "js/Value.h"
 #include "js/Vector.h"
diff --git a/js/src/jsboolinlines.h b/js/src/jsboolinlines.h
index dea1b241fcb4..1f5f073b7ddf 100644
--- a/js/src/jsboolinlines.h
+++ b/js/src/jsboolinlines.h
@@ -10,7 +10,7 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Likely.h"
 
-#include "gc/Root.h"
+#include "js/RootingAPI.h"
 
 #include "jsobjinlines.h"
 
diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index 0c728d04e172..95649fc8cac7 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -22,12 +22,12 @@
 #endif
 #include "assembler/wtf/Platform.h"
 #include "gc/Marking.h"
-#include "gc/Root.h"
 #ifdef JS_ION
 #include "ion/IonCompartment.h"
 #include "ion/Ion.h"
 #endif
 #include "js/MemoryMetrics.h"
+#include "js/RootingAPI.h"
 #include "methodjit/MethodJIT.h"
 #include "methodjit/PolyIC.h"
 #include "methodjit/MonoIC.h"
diff --git a/js/src/jsgcinlines.h b/js/src/jsgcinlines.h
index 7a67908e4a1f..f99b49550bf9 100644
--- a/js/src/jsgcinlines.h
+++ b/js/src/jsgcinlines.h
@@ -12,7 +12,7 @@
 #include "jscompartment.h"
 #include "jslock.h"
 
-#include "gc/Root.h"
+#include "js/RootingAPI.h"
 #include "js/TemplateLib.h"
 #include "vm/Shape.h"
 
diff --git a/js/src/jsinferinlines.h b/js/src/jsinferinlines.h
index 847289c7e67d..eb94e1c26b45 100644
--- a/js/src/jsinferinlines.h
+++ b/js/src/jsinferinlines.h
@@ -12,11 +12,11 @@
 #include "jsinfer.h"
 #include "jsprf.h"
 
-#include "gc/Root.h"
-#include "vm/GlobalObject.h"
 #ifdef JS_ION
 #include "ion/IonFrames.h"
 #endif
+#include "js/RootingAPI.h"
+#include "vm/GlobalObject.h"
 
 #include "vm/Stack-inl.h"
 
diff --git a/js/src/jsobjinlines.h b/js/src/jsobjinlines.h
index 6c575c11f619..a986739f31d0 100644
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -28,8 +28,8 @@
 #include "builtin/Iterator-inl.h"
 #include "gc/Barrier.h"
 #include "gc/Marking.h"
-#include "gc/Root.h"
 #include "js/MemoryMetrics.h"
+#include "js/RootingAPI.h"
 #include "js/TemplateLib.h"
 #include "vm/BooleanObject.h"
 #include "vm/GlobalObject.h"
diff --git a/js/src/jsscript.h b/js/src/jsscript.h
index 33502e3e097a..1b3feda9511e 100644
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.h
@@ -10,12 +10,13 @@
 /*
  * JS script descriptor.
  */
+
 #include "jsdbgapi.h"
 #include "jsinfer.h"
 #include "jsopcode.h"
 
 #include "gc/Barrier.h"
-#include "gc/Root.h"
+#include "js/RootingAPI.h"
 #include "vm/Shape.h"
 
 ForwardDeclareJS(Script);
diff --git a/js/src/vm/PropertyKey.cpp b/js/src/vm/PropertyKey.cpp
index 27ad497f9eee..d7ca7b371607 100644
--- a/js/src/vm/PropertyKey.cpp
+++ b/js/src/vm/PropertyKey.cpp
@@ -8,8 +8,8 @@
 
 #include "mozilla/Assertions.h"
 
-#include "gc/Root.h"
 #include "js/PropertyKey.h"
+#include "js/RootingAPI.h"
 #include "js/Value.h"
 #include "vm/String.h"
 
diff --git a/js/src/vm/Shape.h b/js/src/vm/Shape.h
index b750dc32ebc7..9309a37b59b6 100644
--- a/js/src/vm/Shape.h
+++ b/js/src/vm/Shape.h
@@ -15,9 +15,9 @@
 #include "jspropertytree.h"
 #include "jstypes.h"
 
-#include "js/HashTable.h"
 #include "gc/Heap.h"
-#include "gc/Root.h"
+#include "js/HashTable.h"
+#include "js/RootingAPI.h"
 
 #ifdef _MSC_VER
 #pragma warning(push)
diff --git a/js/src/vm/String.h b/js/src/vm/String.h
index 3260213b1abc..e343dce3a87f 100644
--- a/js/src/vm/String.h
+++ b/js/src/vm/String.h
@@ -11,8 +11,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/GuardObjects.h"
 
-#include "js/CharacterEncoding.h"
-
 #include "jsapi.h"
 #include "jsatom.h"
 #include "jsfriendapi.h"
@@ -20,7 +18,8 @@
 
 #include "gc/Barrier.h"
 #include "gc/Heap.h"
-#include "gc/Root.h"
+#include "js/CharacterEncoding.h"
+#include "js/RootingAPI.h"
 
 ForwardDeclareJS(String);
 class JSDependentString;