diff --git a/b2g/components/Makefile.in b/b2g/components/Makefile.in
index 46c41604d1d5..da26cc6d791d 100644
--- a/b2g/components/Makefile.in
+++ b/b2g/components/Makefile.in
@@ -9,7 +9,7 @@ VPATH      = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
         ActivitiesGlue.js \
         AlertsService.js \
         B2GAboutRedirector.js \
@@ -36,7 +36,7 @@ EXTRA_JS_MODULES = \
 	$(NULL)
 
 ifdef MOZ_UPDATER
-EXTRA_PP_COMPONENTS += UpdatePrompt.js
+DISABLED_EXTRA_PP_COMPONENTS += UpdatePrompt.js
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/b2g/components/moz.build b/b2g/components/moz.build
index 12242bdbdbc6..5b36cdfbada8 100644
--- a/b2g/components/moz.build
+++ b/b2g/components/moz.build
@@ -12,3 +12,26 @@ XPIDL_SOURCES += [
 
 MODULE = 'B2GComponents'
 
+EXTRA_PP_COMPONENTS += [
+    'ActivitiesGlue.js',
+    'AlertsService.js',
+    'B2GAboutRedirector.js',
+    'B2GComponents.manifest',
+    'ContentHandler.js',
+    'ContentPermissionPrompt.js',
+    'DirectoryProvider.js',
+    'FilePicker.js',
+    'MailtoProtocolHandler.js',
+    'MozKeyboard.js',
+    'PaymentGlue.js',
+    'ProcessGlobal.js',
+    'RecoveryService.js',
+    'SmsProtocolHandler.js',
+    'TelProtocolHandler.js',
+    'YoutubeProtocolHandler.js',
+]
+
+if CONFIG['MOZ_UPDATER']:
+    EXTRA_PP_COMPONENTS += [
+        'UpdatePrompt.js',
+    ]
diff --git a/browser/components/Makefile.in b/browser/components/Makefile.in
index dc685b3f9e5f..a70f997846c2 100644
--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@@ -13,7 +13,7 @@ DISABLED_EXTRA_COMPONENTS = \
   BrowserComponents.manifest \
   $(NULL)
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
   nsBrowserContentHandler.js \
   nsBrowserGlue.js \
   $(NULL)
diff --git a/browser/components/feeds/src/Makefile.in b/browser/components/feeds/src/Makefile.in
index 904a5d79920d..afd42cf6f0ef 100644
--- a/browser/components/feeds/src/Makefile.in
+++ b/browser/components/feeds/src/Makefile.in
@@ -25,7 +25,7 @@ DISABLED_EXTRA_COMPONENTS = \
 	WebContentConverter.js \
   $(NULL)
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
 	FeedWriter.js \
 	$(NULL)
 
diff --git a/browser/components/feeds/src/moz.build b/browser/components/feeds/src/moz.build
index e97a4f0ab691..f79e0f956b33 100644
--- a/browser/components/feeds/src/moz.build
+++ b/browser/components/feeds/src/moz.build
@@ -15,3 +15,7 @@ EXTRA_COMPONENTS += [
     'FeedConverter.js',
     'WebContentConverter.js',
 ]
+
+EXTRA_PP_COMPONENTS += [
+    'FeedWriter.js',
+]
diff --git a/browser/components/migration/src/Makefile.in b/browser/components/migration/src/Makefile.in
index 017d5f6fc8d2..ab7afa2202d6 100644
--- a/browser/components/migration/src/Makefile.in
+++ b/browser/components/migration/src/Makefile.in
@@ -19,7 +19,7 @@ DISABLED_EXTRA_COMPONENTS = \
   FirefoxProfileMigrator.js \
   $(NULL)
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
   ChromeProfileMigrator.js \
   $(NULL)
 
@@ -27,19 +27,19 @@ ifeq ($(OS_ARCH),WINNT)
 DISABLED_EXTRA_COMPONENTS += IEProfileMigrator.js \
                     $(NULL)
 
-EXTRA_PP_COMPONENTS += SafariProfileMigrator.js \
+DISABLED_EXTRA_PP_COMPONENTS += SafariProfileMigrator.js \
                        $(NULL)
 
 DEFINES += -DHAS_IE_MIGRATOR -DHAS_SAFARI_MIGRATOR
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_PP_COMPONENTS += SafariProfileMigrator.js \
+DISABLED_EXTRA_PP_COMPONENTS += SafariProfileMigrator.js \
                        $(NULL)
 DEFINES += -DHAS_SAFARI_MIGRATOR
 endif
 
-EXTRA_PP_COMPONENTS += \
+DISABLED_EXTRA_PP_COMPONENTS += \
 	BrowserProfileMigrators.manifest \
 	$(NULL)
 
diff --git a/browser/components/migration/src/moz.build b/browser/components/migration/src/moz.build
index e98f9e082ea0..211f79e22e1e 100644
--- a/browser/components/migration/src/moz.build
+++ b/browser/components/migration/src/moz.build
@@ -20,3 +20,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     EXTRA_COMPONENTS += [
         'IEProfileMigrator.js',
     ]
+
+EXTRA_PP_COMPONENTS += [
+    'BrowserProfileMigrators.manifest',
+    'ChromeProfileMigrator.js',
+]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    EXTRA_PP_COMPONENTS += [
+        'SafariProfileMigrator.js',
+    ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    EXTRA_PP_COMPONENTS += [
+        'SafariProfileMigrator.js',
+    ]
diff --git a/browser/components/moz.build b/browser/components/moz.build
index dc73374babdb..1e2aa74ac939 100644
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -39,3 +39,7 @@ MODULE = 'browsercomps'
 EXTRA_COMPONENTS += [
     'BrowserComponents.manifest',
 ]
+EXTRA_PP_COMPONENTS += [
+    'nsBrowserContentHandler.js',
+    'nsBrowserGlue.js',
+]
diff --git a/browser/fuel/src/Makefile.in b/browser/fuel/src/Makefile.in
index 8166aedd9f31..79b5c91a1e7f 100644
--- a/browser/fuel/src/Makefile.in
+++ b/browser/fuel/src/Makefile.in
@@ -10,6 +10,6 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = fuelApplication.manifest
-EXTRA_PP_COMPONENTS = fuelApplication.js
+DISABLED_EXTRA_PP_COMPONENTS = fuelApplication.js
 
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/fuel/src/moz.build b/browser/fuel/src/moz.build
index d7f2cd6af472..1fc5a0135ddc 100644
--- a/browser/fuel/src/moz.build
+++ b/browser/fuel/src/moz.build
@@ -9,3 +9,7 @@ MODULE = 'fuel'
 EXTRA_COMPONENTS += [
     'fuelApplication.manifest',
 ]
+
+EXTRA_PP_COMPONENTS += [
+    'fuelApplication.js',
+]
diff --git a/browser/metro/components/Makefile.in b/browser/metro/components/Makefile.in
index 4e89f862bdf1..667adf897778 100644
--- a/browser/metro/components/Makefile.in
+++ b/browser/metro/components/Makefile.in
@@ -11,7 +11,7 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 # metro/components.manifest
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
         components.manifest \
         AboutRedirector.js \
         BrowserCLH.js \
diff --git a/browser/metro/components/moz.build b/browser/metro/components/moz.build
index 26492f18f30a..f83a3d104da4 100644
--- a/browser/metro/components/moz.build
+++ b/browser/metro/components/moz.build
@@ -10,3 +10,14 @@ XPIDL_SOURCES += [
 
 MODULE = 'components'
 
+# metro/components.manifest
+EXTRA_PP_COMPONENTS += [
+    'AboutRedirector.js',
+    'BrowserCLH.js',
+    'BrowserStartup.js',
+    'DirectoryProvider.js',
+    'HelperAppDialog.js',
+    'SessionStore.js',
+    'Sidebar.js',
+    'components.manifest',
+]
diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in
index eb061b5b48e2..7ddedb42f8ce 100644
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -34,7 +34,7 @@ EXTRA_COMPONENTS = \
 		messageWakeupService.manifest \
 		$(NULL)
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
 		contentSecurityPolicy.js \
 		$(NULL)
 
diff --git a/content/base/src/moz.build b/content/base/src/moz.build
index 383955bcde61..277a6e2203d8 100644
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -153,3 +153,6 @@ CPP_SOURCES += [
     'nsXMLNameSpaceMap.cpp',
 ]
 
+EXTRA_PP_COMPONENTS += [
+    'contentSecurityPolicy.js',
+]
diff --git a/dom/apps/src/Makefile.in b/dom/apps/src/Makefile.in
index 39932ebd73c6..7f2b9d5f2a12 100644
--- a/dom/apps/src/Makefile.in
+++ b/dom/apps/src/Makefile.in
@@ -15,7 +15,7 @@ DISABLED_EXTRA_COMPONENTS = \
   Webapps.manifest \
   $(NULL)
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
   Webapps.js \
   $(NULL)
 
diff --git a/dom/apps/src/moz.build b/dom/apps/src/moz.build
index 735d90b1705f..c8b90539372e 100644
--- a/dom/apps/src/moz.build
+++ b/dom/apps/src/moz.build
@@ -10,6 +10,10 @@ EXTRA_COMPONENTS += [
     'Webapps.manifest',
 ]
 
+EXTRA_PP_COMPONENTS += [
+    'Webapps.js',
+]
+
 EXTRA_JS_MODULES += [
     'AppDownloadManager.jsm',
     'AppsServiceChild.jsm',
diff --git a/image/decoders/icon/qt/Makefile.in b/image/decoders/icon/qt/Makefile.in
index 9868c78f94ea..b76677b183d3 100644
--- a/image/decoders/icon/qt/Makefile.in
+++ b/image/decoders/icon/qt/Makefile.in
@@ -19,7 +19,7 @@ LOCAL_INCLUDES += $(MOZ_QT_CFLAGS)
 FORCE_STATIC_LIB = 1
 
 EXTRA_COMPONENTS = gtkqticonsconverter.manifest
-EXTRA_PP_COMPONENTS = gtkqticonsconverter.js
+DISABLED_EXTRA_PP_COMPONENTS = gtkqticonsconverter.js
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/image/decoders/icon/qt/moz.build b/image/decoders/icon/qt/moz.build
index efbd2f3da73d..b9ef4a0e3581 100644
--- a/image/decoders/icon/qt/moz.build
+++ b/image/decoders/icon/qt/moz.build
@@ -12,3 +12,6 @@ CPP_SOURCES += [
     'nsIconChannel.cpp',
 ]
 
+EXTRA_PP_COMPONENTS += [
+    'gtkqticonsconverter.js',
+]
diff --git a/mobile/android/components/Makefile.in b/mobile/android/components/Makefile.in
index b6644a6d890d..620dd1dbc9cf 100644
--- a/mobile/android/components/Makefile.in
+++ b/mobile/android/components/Makefile.in
@@ -9,7 +9,7 @@ VPATH      = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
         MobileComponents.manifest \
         AboutRedirector.js \
         BrowserCLH.js \
diff --git a/mobile/android/components/moz.build b/mobile/android/components/moz.build
index 5e2613134503..ae3f7b3affeb 100644
--- a/mobile/android/components/moz.build
+++ b/mobile/android/components/moz.build
@@ -10,3 +10,12 @@ XPIDL_SOURCES += [
 
 MODULE = 'MobileComponents'
 
+EXTRA_PP_COMPONENTS += [
+    'AboutRedirector.js',
+    'BrowserCLH.js',
+    'DirectoryProvider.js',
+    'HelperAppDialog.js',
+    'MobileComponents.manifest',
+    'SessionStore.js',
+    'Sidebar.js',
+]
diff --git a/services/datareporting/Makefile.in b/services/datareporting/Makefile.in
index beb9f0fadb0f..5515ef8ca442 100644
--- a/services/datareporting/Makefile.in
+++ b/services/datareporting/Makefile.in
@@ -20,7 +20,7 @@ EXTRA_COMPONENTS := \
   DataReporting.manifest \
   $(NULL)
 
-EXTRA_PP_COMPONENTS := \
+DISABLED_EXTRA_PP_COMPONENTS := \
   DataReportingService.js \
   $(NULL)
 
diff --git a/services/datareporting/moz.build b/services/datareporting/moz.build
index 0a6b67fd879f..03443a923f4b 100644
--- a/services/datareporting/moz.build
+++ b/services/datareporting/moz.build
@@ -5,3 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
+
+EXTRA_PP_COMPONENTS += [
+    'DataReportingService.js',
+]
diff --git a/testing/marionette/components/Makefile.in b/testing/marionette/components/Makefile.in
index 3842decc1ea6..fc0e8530b23f 100644
--- a/testing/marionette/components/Makefile.in
+++ b/testing/marionette/components/Makefile.in
@@ -13,7 +13,7 @@ ifdef ENABLE_MARIONETTE
 DEFINES += -DENABLE_MARIONETTE=1
 endif
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
     MarionetteComponents.manifest \
     marionettecomponent.js \
     $(NULL)
diff --git a/testing/marionette/components/moz.build b/testing/marionette/components/moz.build
index 895d11993cfb..b21f659ad799 100644
--- a/testing/marionette/components/moz.build
+++ b/testing/marionette/components/moz.build
@@ -4,3 +4,7 @@
 # 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/.
 
+EXTRA_PP_COMPONENTS += [
+    'MarionetteComponents.manifest',
+    'marionettecomponent.js',
+]
diff --git a/toolkit/components/filepicker/Makefile.in b/toolkit/components/filepicker/Makefile.in
index 7aa527e082c4..beacc879cddb 100644
--- a/toolkit/components/filepicker/Makefile.in
+++ b/toolkit/components/filepicker/Makefile.in
@@ -19,7 +19,7 @@ IS_COMPONENT = 1
 MODULE_NAME = nsFileViewModule
 LIBXUL_LIBRARY = 1
 DISABLED_EXTRA_COMPONENTS = nsFilePicker.js
-EXTRA_PP_COMPONENTS = nsFilePicker.manifest
+DISABLED_EXTRA_PP_COMPONENTS = nsFilePicker.manifest
 endif
 endif
 
diff --git a/toolkit/components/filepicker/moz.build b/toolkit/components/filepicker/moz.build
index cf77586ee74b..71a50e6c32bb 100644
--- a/toolkit/components/filepicker/moz.build
+++ b/toolkit/components/filepicker/moz.build
@@ -16,3 +16,6 @@ if CONFIG['MOZ_XUL'] and \
         EXTRA_COMPONENTS += [
             'nsFilePicker.js',
         ]
+        EXTRA_PP_COMPONENTS += [
+            'nsFilePicker.manifest',
+        ]
diff --git a/toolkit/components/passwordmgr/Makefile.in b/toolkit/components/passwordmgr/Makefile.in
index 502207ed1fa7..4334b8cf150b 100644
--- a/toolkit/components/passwordmgr/Makefile.in
+++ b/toolkit/components/passwordmgr/Makefile.in
@@ -18,7 +18,7 @@ DISABLED_EXTRA_COMPONENTS = \
   storage-Legacy.js \
   $(NULL)
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
   storage-mozStorage.js \
   $(NULL)
 
diff --git a/toolkit/components/passwordmgr/moz.build b/toolkit/components/passwordmgr/moz.build
index f3d8c63fb08f..6810f6cac91d 100644
--- a/toolkit/components/passwordmgr/moz.build
+++ b/toolkit/components/passwordmgr/moz.build
@@ -26,3 +26,7 @@ EXTRA_COMPONENTS += [
     'passwordmgr.manifest',
     'storage-Legacy.js',
 ]
+
+EXTRA_PP_COMPONENTS += [
+    'storage-mozStorage.js',
+]
diff --git a/toolkit/components/satchel/Makefile.in b/toolkit/components/satchel/Makefile.in
index ae1a69eab8c5..047f4547ba5c 100644
--- a/toolkit/components/satchel/Makefile.in
+++ b/toolkit/components/satchel/Makefile.in
@@ -26,7 +26,7 @@ DISABLED_EXTRA_COMPONENTS = \
   satchel.manifest \
   $(NULL)
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
 	nsFormHistory.js \
 	$(NULL)
 
diff --git a/toolkit/components/satchel/moz.build b/toolkit/components/satchel/moz.build
index c49814817b45..a6a49d7116fb 100644
--- a/toolkit/components/satchel/moz.build
+++ b/toolkit/components/satchel/moz.build
@@ -25,3 +25,7 @@ EXTRA_COMPONENTS += [
     'nsInputListAutoComplete.js',
     'satchel.manifest',
 ]
+
+EXTRA_PP_COMPONENTS += [
+    'nsFormHistory.js',
+]
diff --git a/toolkit/components/search/Makefile.in b/toolkit/components/search/Makefile.in
index 07f3af1bb694..d305211b1b39 100644
--- a/toolkit/components/search/Makefile.in
+++ b/toolkit/components/search/Makefile.in
@@ -14,7 +14,7 @@ DISABLED_EXTRA_COMPONENTS = \
   nsSearchSuggestions.js \
   $(NULL)
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
   nsSearchService.js \
   $(NULL)
 
diff --git a/toolkit/components/search/moz.build b/toolkit/components/search/moz.build
index dae50646f897..79e3095a135a 100644
--- a/toolkit/components/search/moz.build
+++ b/toolkit/components/search/moz.build
@@ -10,3 +10,7 @@ EXTRA_COMPONENTS += [
     'nsSearchSuggestions.js',
     'toolkitsearch.manifest',
 ]
+
+EXTRA_PP_COMPONENTS += [
+    'nsSearchService.js',
+]
diff --git a/toolkit/components/telemetry/Makefile.in b/toolkit/components/telemetry/Makefile.in
index afce0f4546fb..ec3cf8bed386 100644
--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@@ -22,7 +22,7 @@ FAIL_ON_WARNINGS = 1
 LIBRARY_NAME = telemetry
 MSVC_ENABLE_PGO := 1
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
   TelemetryPing.js \
   $(NULL)
 
diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build
index 8d1531b6b8e5..81adbbacbe4c 100644
--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -26,3 +26,7 @@ CPP_SOURCES += [
 EXTRA_COMPONENTS += [
     'TelemetryPing.manifest',
 ]
+
+EXTRA_PP_COMPONENTS += [
+    'TelemetryPing.js',
+]
diff --git a/toolkit/components/url-classifier/Makefile.in b/toolkit/components/url-classifier/Makefile.in
index 52c9cb6a96a6..4dca79686633 100644
--- a/toolkit/components/url-classifier/Makefile.in
+++ b/toolkit/components/url-classifier/Makefile.in
@@ -27,7 +27,7 @@ DISABLED_EXTRA_COMPONENTS = \
   $(NULL)
 
 # Same as JS components that are run through the pre-processor.
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
   nsUrlClassifierLib.js \
   nsUrlClassifierListManager.js \
   $(NULL)
diff --git a/toolkit/components/url-classifier/moz.build b/toolkit/components/url-classifier/moz.build
index 1cbe116dd08c..4d73ab82c8fb 100644
--- a/toolkit/components/url-classifier/moz.build
+++ b/toolkit/components/url-classifier/moz.build
@@ -35,3 +35,9 @@ EXTRA_COMPONENTS += [
     'nsURLClassifier.manifest',
     'nsUrlClassifierHashCompleter.js',
 ]
+
+# Same as JS components that are run through the pre-processor.
+EXTRA_PP_COMPONENTS += [
+    'nsUrlClassifierLib.js',
+    'nsUrlClassifierListManager.js',
+]
diff --git a/toolkit/mozapps/downloads/Makefile.in b/toolkit/mozapps/downloads/Makefile.in
index 756fc387613b..14383f50bcf0 100644
--- a/toolkit/mozapps/downloads/Makefile.in
+++ b/toolkit/mozapps/downloads/Makefile.in
@@ -11,7 +11,7 @@ VPATH     = @srcdir@
 include $(topsrcdir)/config/config.mk
 
 DISABLED_EXTRA_COMPONENTS = nsHelperAppDlg.manifest
-EXTRA_PP_COMPONENTS = nsHelperAppDlg.js
+DISABLED_EXTRA_PP_COMPONENTS = nsHelperAppDlg.js
 
 EXTRA_JS_MODULES = \
   DownloadLastDir.jsm \
diff --git a/toolkit/mozapps/downloads/moz.build b/toolkit/mozapps/downloads/moz.build
index 9f5d6e977a95..af176a0d783e 100644
--- a/toolkit/mozapps/downloads/moz.build
+++ b/toolkit/mozapps/downloads/moz.build
@@ -11,3 +11,7 @@ MODULE = 'helperAppDlg'
 EXTRA_COMPONENTS += [
     'nsHelperAppDlg.manifest',
 ]
+
+EXTRA_PP_COMPONENTS += [
+    'nsHelperAppDlg.js',
+]
diff --git a/toolkit/mozapps/extensions/Makefile.in b/toolkit/mozapps/extensions/Makefile.in
index 9089a679c072..c12d48355cbf 100644
--- a/toolkit/mozapps/extensions/Makefile.in
+++ b/toolkit/mozapps/extensions/Makefile.in
@@ -25,7 +25,7 @@ else ifdef MOZ_DEBUG
 DEFINES += -DMOZ_EM_DEBUG=1
 endif
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
   nsBlocklistService.js \
   extensions.manifest \
   $(NULL)
diff --git a/toolkit/mozapps/extensions/moz.build b/toolkit/mozapps/extensions/moz.build
index dbe02ae180d5..27cefc5fede6 100644
--- a/toolkit/mozapps/extensions/moz.build
+++ b/toolkit/mozapps/extensions/moz.build
@@ -19,3 +19,8 @@ EXTRA_COMPONENTS += [
     'amContentHandler.js',
     'amWebInstallListener.js',
 ]
+
+EXTRA_PP_COMPONENTS += [
+    'extensions.manifest',
+    'nsBlocklistService.js',
+]
diff --git a/toolkit/mozapps/update/Makefile.in b/toolkit/mozapps/update/Makefile.in
index b0488c6af952..3dc336ea3548 100644
--- a/toolkit/mozapps/update/Makefile.in
+++ b/toolkit/mozapps/update/Makefile.in
@@ -16,7 +16,7 @@ DISABLED_EXTRA_COMPONENTS = \
 
 ifdef MOZ_UPDATER
 
-EXTRA_PP_COMPONENTS += \
+DISABLED_EXTRA_PP_COMPONENTS += \
   nsUpdateService.js \
   nsUpdateServiceStub.js \
   $(NULL)
diff --git a/toolkit/mozapps/update/moz.build b/toolkit/mozapps/update/moz.build
index ef1119dd9d05..d0242c4c3295 100644
--- a/toolkit/mozapps/update/moz.build
+++ b/toolkit/mozapps/update/moz.build
@@ -42,3 +42,9 @@ if CONFIG['MOZ_UPDATER']:
     EXTRA_COMPONENTS += [
         'nsUpdateService.manifest',
     ]
+
+if CONFIG['MOZ_UPDATER']:
+    EXTRA_PP_COMPONENTS += [
+        'nsUpdateService.js',
+        'nsUpdateServiceStub.js',
+    ]
diff --git a/xulrunner/setup/Makefile.in b/xulrunner/setup/Makefile.in
index 18fa117cd8bf..cf999c3ce99f 100644
--- a/xulrunner/setup/Makefile.in
+++ b/xulrunner/setup/Makefile.in
@@ -10,7 +10,7 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 EXTRA_COMPONENTS = nsXULAppInstall.manifest
-EXTRA_PP_COMPONENTS = nsXULAppInstall.js
+DISABLED_EXTRA_PP_COMPONENTS = nsXULAppInstall.js
 
 DEFINES = -DBIN_SUFFIX=$(BIN_SUFFIX)
 
diff --git a/xulrunner/setup/moz.build b/xulrunner/setup/moz.build
index fb59a800018c..08bb93f243f3 100644
--- a/xulrunner/setup/moz.build
+++ b/xulrunner/setup/moz.build
@@ -12,3 +12,6 @@ XPIDL_MODULE = 'xulapp_setup'
 
 MODULE = 'xulrunner'
 
+EXTRA_PP_COMPONENTS += [
+    'nsXULAppInstall.js',
+]