--- a/dom/bindings/nsScriptError.cpp
+++ b/dom/bindings/nsScriptError.cpp
@@ -314,17 +314,17 @@ ToStringHelper(const char* aSeverity, co
 {
     static const char format0[] =
         "[%s: \"%s\" {file: \"%s\" line: %d column: %d source: \"%s\"}]";
     static const char format1[] =
         "[%s: \"%s\" {file: \"%s\" line: %d}]";
     static const char format2[] =
         "[%s: \"%s\"]";
 
-    UniqueChars temp;
+    JS::UniqueChars temp;
     char* tempMessage = nullptr;
     char* tempSourceName = nullptr;
     char* tempSourceLine = nullptr;
 
     if (!aMessage.IsEmpty())
         tempMessage = ToNewUTF8String(aMessage);
     if (!aSourceName.IsEmpty())
         // Use at most 512 characters from mSourceName.

--- a/dom/bindings/nsScriptErrorWithStack.cpp
+++ b/dom/bindings/nsScriptErrorWithStack.cpp
@@ -17,17 +17,17 @@
 #include "nsGlobalWindow.h"
 #include "nsCycleCollectionParticipant.h"
 
 using namespace mozilla::dom;
 
 namespace {
 
 static nsCString
-FormatStackString(JSContext* cx, HandleObject aStack) {
+FormatStackString(JSContext* cx, JS::HandleObject aStack) {
     JS::RootedString formattedStack(cx);
 
     if (!JS::BuildStackString(cx, aStack, &formattedStack)) {
         return nsCString();
     }
 
     nsAutoJSString stackJSString;
     if (!stackJSString.init(cx, formattedStack)) {
@@ -106,15 +106,15 @@ nsScriptErrorWithStack::ToString(nsACStr
     }
 
     AutoJSAPI jsapi;
     if (!jsapi.Init(mStack)) {
         return NS_ERROR_FAILURE;
     }
 
     JSContext* cx = jsapi.cx();
-    RootedObject stack(cx, mStack);
+    JS::RootedObject stack(cx, mStack);
     nsCString stackString = FormatStackString(cx, stack);
     nsCString combined = message + NS_LITERAL_CSTRING("\n") + stackString;
     aResult.Assign(combined);
 
     return NS_OK;
 }

--- a/dom/bindings/test/TestInterfaceIterableDouble.h
+++ b/dom/bindings/test/TestInterfaceIterableDouble.h
@@ -2,18 +2,19 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 mozilla_dom_TestInterfaceIterableDouble_h
 #define mozilla_dom_TestInterfaceIterableDouble_h
 
+#include "nsCOMPtr.h"
+#include "nsTArray.h"
 #include "nsWrapperCache.h"
-#include "nsCOMPtr.h"
 
 class nsPIDOMWindowInner;
 
 namespace mozilla {
 
 class ErrorResult;
 
 namespace dom {

--- a/dom/bindings/test/TestInterfaceIterableDoubleUnion.h
+++ b/dom/bindings/test/TestInterfaceIterableDoubleUnion.h
@@ -2,18 +2,19 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 mozilla_dom_TestInterfaceIterableDoubleUnion_h
 #define mozilla_dom_TestInterfaceIterableDoubleUnion_h
 
+#include "mozilla/dom/TestInterfaceJSMaplikeSetlikeIterableBinding.h"
+#include "nsCOMPtr.h"
 #include "nsWrapperCache.h"
-#include "nsCOMPtr.h"
 
 class nsPIDOMWindowInner;
 
 namespace mozilla {
 
 class ErrorResult;
 
 namespace dom {

--- a/dom/bindings/test/TestInterfaceIterableSingle.h
+++ b/dom/bindings/test/TestInterfaceIterableSingle.h
@@ -2,18 +2,19 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 mozilla_dom_TestInterfaceIterableSingle_h
 #define mozilla_dom_TestInterfaceIterableSingle_h
 
+#include "nsCOMPtr.h"
 #include "nsWrapperCache.h"
-#include "nsCOMPtr.h"
+#include "nsTArray.h"
 
 class nsPIDOMWindowInner;
 
 namespace mozilla {
 
 class ErrorResult;
 
 namespace dom {