diff --git a/js/public/RootingAPI.h b/js/public/RootingAPI.h
index be4b12ce611f..9f448d3018c2 100644
--- a/js/public/RootingAPI.h
+++ b/js/public/RootingAPI.h
@@ -557,8 +557,8 @@ class MOZ_STACK_CLASS MutableHandle : public js::MutableHandleBase<T>
 };
 
 #ifdef JSGC_GENERATIONAL
-JS_PUBLIC_API(void) HeapCellPostBarrier(js::gc::Cell **cellp);
-JS_PUBLIC_API(void) HeapCellRelocate(js::gc::Cell **cellp);
+JS_FRIEND_API(void) HeapCellPostBarrier(js::gc::Cell **cellp);
+JS_FRIEND_API(void) HeapCellRelocate(js::gc::Cell **cellp);
 #endif
 
 } /* namespace JS */
diff --git a/media/webrtc/signaling/test/Makefile.in b/media/webrtc/signaling/test/Makefile.in
index 079cc430cdf3..271753c82af2 100644
--- a/media/webrtc/signaling/test/Makefile.in
+++ b/media/webrtc/signaling/test/Makefile.in
@@ -7,7 +7,6 @@ LIBS = \
   $(NSPR_LIBS) \
   $(NSS_LIBS) \
   $(REALTIME_LIBS) \
-  $(MOZ_JS_LIBS) \
   $(DEPTH)/xpcom/glue/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
   $(DEPTH)/media/mtransport/standalone/$(LIB_PREFIX)mtransport_s.$(LIB_SUFFIX) \
   $(DEPTH)/media/webrtc/signalingtest/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \
diff --git a/toolkit/components/places/tests/cpp/Makefile.in b/toolkit/components/places/tests/cpp/Makefile.in
deleted file mode 100644
index dde8d9a87cd6..000000000000
--- a/toolkit/components/places/tests/cpp/Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/. */
-
-LIBS += $(MOZ_JS_LIBS)
-
-ifndef ZLIB_IN_MOZGLUE
-LIBS += $(MOZ_ZLIB_LIBS)
-endif