diff --git a/b2g/components/Makefile.in b/b2g/components/Makefile.in
index da26cc6d791d..5eeb9cd102f8 100644
--- a/b2g/components/Makefile.in
+++ b/b2g/components/Makefile.in
@@ -9,25 +9,6 @@ VPATH      = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-        ActivitiesGlue.js \
-        AlertsService.js \
-        B2GAboutRedirector.js \
-        B2GComponents.manifest \
-        ContentHandler.js \
-        ContentPermissionPrompt.js \
-        DirectoryProvider.js \
-        FilePicker.js \
-        MailtoProtocolHandler.js \
-        MozKeyboard.js \
-        ProcessGlobal.js \
-        PaymentGlue.js \
-        SmsProtocolHandler.js \
-        TelProtocolHandler.js \
-        YoutubeProtocolHandler.js \
-        RecoveryService.js \
-        $(NULL)
-
 EXTRA_JS_MODULES = \
 	Keyboard.jsm \
 	TelURIParser.jsm \
@@ -35,8 +16,4 @@ EXTRA_JS_MODULES = \
 	ErrorPage.jsm \
 	$(NULL)
 
-ifdef MOZ_UPDATER
-DISABLED_EXTRA_PP_COMPONENTS += UpdatePrompt.js
-endif
-
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/Makefile.in b/browser/components/Makefile.in
index a70f997846c2..ab2adb02b3a8 100644
--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@@ -13,11 +13,6 @@ DISABLED_EXTRA_COMPONENTS = \
   BrowserComponents.manifest \
   $(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-  nsBrowserContentHandler.js \
-  nsBrowserGlue.js \
-  $(NULL)
-
 EXTRA_JS_MODULES = distribution.js
 
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/feeds/src/Makefile.in b/browser/components/feeds/src/Makefile.in
index d61cb1e42ee1..5691dbb503e0 100644
--- a/browser/components/feeds/src/Makefile.in
+++ b/browser/components/feeds/src/Makefile.in
@@ -23,11 +23,6 @@ DISABLED_EXTRA_COMPONENTS = \
 	WebContentConverter.js \
   $(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-	FeedWriter.js \
-	$(NULL)
-
-
 LOCAL_INCLUDES = -I$(srcdir)/../../build
 
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/migration/src/Makefile.in b/browser/components/migration/src/Makefile.in
index 50bc1574a51b..d300a0546780 100644
--- a/browser/components/migration/src/Makefile.in
+++ b/browser/components/migration/src/Makefile.in
@@ -17,30 +17,17 @@ DISABLED_EXTRA_COMPONENTS = \
   FirefoxProfileMigrator.js \
   $(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-  ChromeProfileMigrator.js \
-  $(NULL)
-
 ifeq ($(OS_ARCH),WINNT)
 DISABLED_EXTRA_COMPONENTS += IEProfileMigrator.js \
                     $(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS += SafariProfileMigrator.js \
-                       $(NULL)
-
 DEFINES += -DHAS_IE_MIGRATOR -DHAS_SAFARI_MIGRATOR
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-DISABLED_EXTRA_PP_COMPONENTS += SafariProfileMigrator.js \
-                       $(NULL)
 DEFINES += -DHAS_SAFARI_MIGRATOR
 endif
 
-DISABLED_EXTRA_PP_COMPONENTS += \
-	BrowserProfileMigrators.manifest \
-	$(NULL)
-
 EXTRA_PP_JS_MODULES = \
 	MigrationUtils.jsm \
 	$(NULL)
diff --git a/browser/fuel/src/Makefile.in b/browser/fuel/src/Makefile.in
index 79b5c91a1e7f..f479051d7d0c 100644
--- a/browser/fuel/src/Makefile.in
+++ b/browser/fuel/src/Makefile.in
@@ -10,6 +10,5 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = fuelApplication.manifest
-DISABLED_EXTRA_PP_COMPONENTS = fuelApplication.js
 
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/metro/components/Makefile.in b/browser/metro/components/Makefile.in
index 667adf897778..1b274e79bcc0 100644
--- a/browser/metro/components/Makefile.in
+++ b/browser/metro/components/Makefile.in
@@ -11,17 +11,6 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 # metro/components.manifest
-DISABLED_EXTRA_PP_COMPONENTS = \
-        components.manifest \
-        AboutRedirector.js \
-        BrowserCLH.js \
-        BrowserStartup.js \
-        DirectoryProvider.js\
-        HelperAppDialog.js \
-        Sidebar.js \
-        SessionStore.js \
-        $(NULL)
-
 EXTRA_COMPONENTS = \
         AlertsService.js \
         ContentPermissionPrompt.js \
diff --git a/config/rules.mk b/config/rules.mk
index a8483511bbce..f64edab10ed2 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -16,6 +16,7 @@ endif
 # responsibility between Makefile.in and mozbuild files.
 _MOZBUILD_EXTERNAL_VARIABLES := \
   DIRS \
+  EXTRA_PP_COMPONENTS \
   HOST_CSRCS \
   HOST_LIBRARY_NAME \
   MODULE \
diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in
index 7ddedb42f8ce..d5ab301fd42b 100644
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -34,10 +34,6 @@ EXTRA_COMPONENTS = \
 		messageWakeupService.manifest \
 		$(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-		contentSecurityPolicy.js \
-		$(NULL)
-
 EXTRA_JS_MODULES = \
 		CSPUtils.jsm \
 		$(NULL)
diff --git a/dom/apps/src/Makefile.in b/dom/apps/src/Makefile.in
index 7f2b9d5f2a12..0cd571d56927 100644
--- a/dom/apps/src/Makefile.in
+++ b/dom/apps/src/Makefile.in
@@ -15,10 +15,6 @@ DISABLED_EXTRA_COMPONENTS = \
   Webapps.manifest \
   $(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-  Webapps.js \
-  $(NULL)
-
 EXTRA_PP_JS_MODULES += \
   Webapps.jsm \
   AppsUtils.jsm \
diff --git a/image/decoders/icon/qt/Makefile.in b/image/decoders/icon/qt/Makefile.in
index e55b34304fda..20ddb8fc5730 100644
--- a/image/decoders/icon/qt/Makefile.in
+++ b/image/decoders/icon/qt/Makefile.in
@@ -18,7 +18,6 @@ LOCAL_INCLUDES += $(MOZ_QT_CFLAGS)
 FORCE_STATIC_LIB = 1
 
 EXTRA_COMPONENTS = gtkqticonsconverter.manifest
-DISABLED_EXTRA_PP_COMPONENTS = gtkqticonsconverter.js
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index a8483511bbce..f64edab10ed2 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -16,6 +16,7 @@ endif
 # responsibility between Makefile.in and mozbuild files.
 _MOZBUILD_EXTERNAL_VARIABLES := \
   DIRS \
+  EXTRA_PP_COMPONENTS \
   HOST_CSRCS \
   HOST_LIBRARY_NAME \
   MODULE \
diff --git a/mobile/android/components/Makefile.in b/mobile/android/components/Makefile.in
index 620dd1dbc9cf..b3d5862fcd2d 100644
--- a/mobile/android/components/Makefile.in
+++ b/mobile/android/components/Makefile.in
@@ -9,16 +9,6 @@ VPATH      = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-        MobileComponents.manifest \
-        AboutRedirector.js \
-        BrowserCLH.js \
-        DirectoryProvider.js\
-        HelperAppDialog.js \
-        Sidebar.js \
-        SessionStore.js \
-        $(NULL)
-
 EXTRA_COMPONENTS = \
         AlertsService.js \
         ContentPermissionPrompt.js \
diff --git a/services/datareporting/Makefile.in b/services/datareporting/Makefile.in
index 5515ef8ca442..67abc4c0a36b 100644
--- a/services/datareporting/Makefile.in
+++ b/services/datareporting/Makefile.in
@@ -20,12 +20,6 @@ EXTRA_COMPONENTS := \
   DataReporting.manifest \
   $(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS := \
-  DataReportingService.js \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 $(FINAL_TARGET)/components/DataReportingService.js: policy.jsm sessions.jsm ../common/observers.js
-
-
diff --git a/testing/marionette/components/Makefile.in b/testing/marionette/components/Makefile.in
index fc0e8530b23f..010c22fb0d8a 100644
--- a/testing/marionette/components/Makefile.in
+++ b/testing/marionette/components/Makefile.in
@@ -13,9 +13,4 @@ ifdef ENABLE_MARIONETTE
 DEFINES += -DENABLE_MARIONETTE=1
 endif
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-    MarionetteComponents.manifest \
-    marionettecomponent.js \
-    $(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/passwordmgr/Makefile.in b/toolkit/components/passwordmgr/Makefile.in
index 70e3613bbf5a..566a32fec70f 100644
--- a/toolkit/components/passwordmgr/Makefile.in
+++ b/toolkit/components/passwordmgr/Makefile.in
@@ -18,10 +18,6 @@ DISABLED_EXTRA_COMPONENTS = \
   storage-Legacy.js \
   $(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-  storage-mozStorage.js \
-  $(NULL)
-
 EXTRA_JS_MODULES = \
   LoginManagerContent.jsm \
   $(NULL)
diff --git a/toolkit/components/satchel/Makefile.in b/toolkit/components/satchel/Makefile.in
index 939efe234aae..384fd4d1b4e2 100644
--- a/toolkit/components/satchel/Makefile.in
+++ b/toolkit/components/satchel/Makefile.in
@@ -25,10 +25,6 @@ DISABLED_EXTRA_COMPONENTS = \
   satchel.manifest \
   $(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-	nsFormHistory.js \
-	$(NULL)
-
 EXTRA_JS_MODULES = \
   nsFormAutoCompleteResult.jsm \
   $(NULL)
diff --git a/toolkit/components/search/Makefile.in b/toolkit/components/search/Makefile.in
index d305211b1b39..d0f5ac6fdeac 100644
--- a/toolkit/components/search/Makefile.in
+++ b/toolkit/components/search/Makefile.in
@@ -14,10 +14,6 @@ DISABLED_EXTRA_COMPONENTS = \
   nsSearchSuggestions.js \
   $(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-  nsSearchService.js \
-  $(NULL)
-
 DEFINES += -DMOZ_DISTRIBUTION_ID=$(MOZ_DISTRIBUTION_ID)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/telemetry/Makefile.in b/toolkit/components/telemetry/Makefile.in
index ec3cf8bed386..c7a48854bcde 100644
--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@@ -22,10 +22,6 @@ FAIL_ON_WARNINGS = 1
 LIBRARY_NAME = telemetry
 MSVC_ENABLE_PGO := 1
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-  TelemetryPing.js \
-  $(NULL)
-
 DISABLED_EXTRA_COMPONENTS = \
   TelemetryPing.manifest \
   $(NULL)
diff --git a/toolkit/components/url-classifier/Makefile.in b/toolkit/components/url-classifier/Makefile.in
index ad10f9b0223a..a0c245d85da7 100644
--- a/toolkit/components/url-classifier/Makefile.in
+++ b/toolkit/components/url-classifier/Makefile.in
@@ -26,11 +26,6 @@ DISABLED_EXTRA_COMPONENTS = \
   $(NULL)
 
 # Same as JS components that are run through the pre-processor.
-DISABLED_EXTRA_PP_COMPONENTS = \
-  nsUrlClassifierLib.js \
-  nsUrlClassifierListManager.js \
-  $(NULL)
-
 EXTRA_JS_MODULES = \
   SafeBrowsing.jsm \
   $(NULL)
diff --git a/toolkit/mozapps/downloads/Makefile.in b/toolkit/mozapps/downloads/Makefile.in
index 14383f50bcf0..0f395ded6472 100644
--- a/toolkit/mozapps/downloads/Makefile.in
+++ b/toolkit/mozapps/downloads/Makefile.in
@@ -11,7 +11,6 @@ VPATH     = @srcdir@
 include $(topsrcdir)/config/config.mk
 
 DISABLED_EXTRA_COMPONENTS = nsHelperAppDlg.manifest
-DISABLED_EXTRA_PP_COMPONENTS = nsHelperAppDlg.js
 
 EXTRA_JS_MODULES = \
   DownloadLastDir.jsm \
diff --git a/toolkit/mozapps/extensions/Makefile.in b/toolkit/mozapps/extensions/Makefile.in
index c12d48355cbf..ad9cc623ec32 100644
--- a/toolkit/mozapps/extensions/Makefile.in
+++ b/toolkit/mozapps/extensions/Makefile.in
@@ -25,11 +25,6 @@ else ifdef MOZ_DEBUG
 DEFINES += -DMOZ_EM_DEBUG=1
 endif
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-  nsBlocklistService.js \
-  extensions.manifest \
-  $(NULL)
-
 DISABLED_EXTRA_COMPONENTS = \
   addonManager.js \
   amContentHandler.js \
diff --git a/toolkit/mozapps/update/Makefile.in b/toolkit/mozapps/update/Makefile.in
index 3dc336ea3548..97dfed6dcd63 100644
--- a/toolkit/mozapps/update/Makefile.in
+++ b/toolkit/mozapps/update/Makefile.in
@@ -16,11 +16,6 @@ DISABLED_EXTRA_COMPONENTS = \
 
 ifdef MOZ_UPDATER
 
-DISABLED_EXTRA_PP_COMPONENTS += \
-  nsUpdateService.js \
-  nsUpdateServiceStub.js \
-  $(NULL)
-
 DISABLED_EXTRA_COMPONENTS += \
   nsUpdateService.manifest \
   $(NULL)
diff --git a/xulrunner/setup/Makefile.in b/xulrunner/setup/Makefile.in
index cf999c3ce99f..3c7f35bd466c 100644
--- a/xulrunner/setup/Makefile.in
+++ b/xulrunner/setup/Makefile.in
@@ -10,7 +10,6 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 EXTRA_COMPONENTS = nsXULAppInstall.manifest
-DISABLED_EXTRA_PP_COMPONENTS = nsXULAppInstall.js
 
 DEFINES = -DBIN_SUFFIX=$(BIN_SUFFIX)