diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 81281b36a837..4bfe15dec379 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -41,16 +41,6 @@ symverscript: symverscript.in
 EXTRA_DEPS += symverscript
 endif
 
-export_files = js-config.h
-ifdef HAVE_DTRACE
-export_files += $(CURDIR)/javascript-trace.h
-endif
-
-INSTALL_TARGETS += jsconfig
-jsconfig_FILES = $(export_files)
-jsconfig_DEST = $(DIST)/include
-jsconfig_TARGET := export
-
 include $(topsrcdir)/config/rules.mk
 
 # check_vanilla_allocations.py is tailored to Linux, so only run it there.
@@ -253,7 +243,7 @@ install:: ETWProvider.mof ETWProvider.man
 endif
 
 ifdef HAVE_DTRACE
-$(CURDIR)/javascript-trace.h: $(srcdir)/devtools/javascript-trace.d
+javascript-trace.h: $(srcdir)/devtools/javascript-trace.d
 	dtrace -x nolibs -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in
 	sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \
 	    -e '/const/!s/char \*/const char */g' \
diff --git a/js/src/gdb/Makefile.in b/js/src/gdb/Makefile.in
deleted file mode 100644
index 932e28f915f4..000000000000
--- a/js/src/gdb/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- Mode: makefile -*-
-#
-# 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/.
-
-# Place a GDB Python auto-load file next to the gdb-tests executable, both
-# in the build directory and in the dist/bin directory.
-PP_TARGETS += GDB_AUTOLOAD
-GDB_AUTOLOAD := gdb-tests-gdb.py.in
-GDB_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(srcdir)/..)
-
-INSTALL_TARGETS += GDB_INSTALL_AUTOLOAD
-GDB_INSTALL_AUTOLOAD_FILES := $(CURDIR)/gdb-tests-gdb.py
-GDB_INSTALL_AUTOLOAD_DEST := $(DIST)/bin
diff --git a/js/src/gdb/moz.build b/js/src/gdb/moz.build
index c80333259080..4cacea5ce994 100644
--- a/js/src/gdb/moz.build
+++ b/js/src/gdb/moz.build
@@ -38,3 +38,7 @@ OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
 # This is intended as a temporary workaround to enable VS2015.
 if CONFIG['_MSC_VER']:
     CXXFLAGS += ['-wd4312']
+
+DEFINES['topsrcdir'] = '%s/js/src' % TOPSRCDIR
+FINAL_TARGET_PP_FILES += ['gdb-tests-gdb.py.in']
+OBJDIR_FILES.js.src.gdb += ['!/dist/bin/gdb-tests-gdb.py']
diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in
index cc643b858da3..2aac79839392 100644
--- a/js/src/jsapi-tests/Makefile.in
+++ b/js/src/jsapi-tests/Makefile.in
@@ -7,9 +7,3 @@
 ifdef QEMU_EXE
 MOZ_POST_PROGRAM_COMMAND = $(topsrcdir)/build/qemu-wrap --qemu $(QEMU_EXE) --libdir $(CROSS_LIB)
 endif
-
-# Place a GDB Python auto-load file next to the jsapi-tests executable in
-# the build directory.
-PP_TARGETS += JSAPI_TESTS_AUTOLOAD
-JSAPI_TESTS_AUTOLOAD := jsapi-tests-gdb.py.in
-JSAPI_TESTS_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(srcdir)/..)
diff --git a/js/src/jsapi-tests/moz.build b/js/src/jsapi-tests/moz.build
index 2029141dd5bc..dc0b1b5eb02c 100644
--- a/js/src/jsapi-tests/moz.build
+++ b/js/src/jsapi-tests/moz.build
@@ -133,3 +133,6 @@ OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
 # This is intended as a temporary workaround to enable VS2015.
 if CONFIG['_MSC_VER']:
     CXXFLAGS += ['-wd4312']
+
+DEFINES['topsrcdir'] = '%s/js/src' % TOPSRCDIR
+OBJDIR_PP_FILES.js.src['jsapi-tests'] += ['jsapi-tests-gdb.py.in']
diff --git a/js/src/moz.build b/js/src/moz.build
index 6bb8b4908167..8fa4e86f6182 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -77,10 +77,16 @@ CONFIGURE_DEFINE_FILES += [
     'js-config.h',
 ]
 
+if CONFIG['HAVE_DTRACE']:
+    GENERATED_FILES += ['javascript-trace.h']
+
+    EXPORTS += ['!javascript-trace.h']
+
 # Changes to internal header files, used externally, massively slow down
 # browser builds.  Don't add new files here unless you know what you're
 # doing!
 EXPORTS += [
+    '!js-config.h',
     'js.msg',
     'jsalloc.h',
     'jsapi.h',
diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in
index 1fe8433d8096..1f51e23cc6d5 100644
--- a/js/src/shell/Makefile.in
+++ b/js/src/shell/Makefile.in
@@ -8,16 +8,6 @@ ifdef QEMU_EXE
 MOZ_POST_PROGRAM_COMMAND = $(topsrcdir)/build/qemu-wrap --qemu $(QEMU_EXE) --libdir $(CROSS_LIB)
 endif
 
-# Place a GDB Python auto-load file next to the shell executable, both in
-# the build directory and in the dist/bin directory.
-PP_TARGETS += SHELL_AUTOLOAD
-SHELL_AUTOLOAD := js-gdb.py.in
-SHELL_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(srcdir)/..)
-
-INSTALL_TARGETS += SHELL_INSTALL_AUTOLOAD
-SHELL_INSTALL_AUTOLOAD_FILES := $(CURDIR)/js-gdb.py
-SHELL_INSTALL_AUTOLOAD_DEST := $(DIST)/bin
-
 include $(topsrcdir)/config/rules.mk
 
 # People expect the js shell to wind up in the top-level JS dir.
diff --git a/js/src/shell/moz.build b/js/src/shell/moz.build
index 03bf39ad5b13..388c0a6dabfa 100644
--- a/js/src/shell/moz.build
+++ b/js/src/shell/moz.build
@@ -48,3 +48,9 @@ shellmoduleloader.inputs = [
 # This is intended as a temporary workaround to enable VS2015.
 if CONFIG['_MSC_VER']:
     CXXFLAGS += ['-wd4312']
+
+# Place a GDB Python auto-load file next to the shell executable, both in
+# the build directory and in the dist/bin directory.
+DEFINES['topsrcdir'] = '%s/js/src' % TOPSRCDIR
+FINAL_TARGET_PP_FILES += ['js-gdb.py.in']
+OBJDIR_FILES.js.src.shell += ['!/dist/bin/js-gdb.py']