--- a/b2g/components/Makefile.in
+++ b/b2g/components/Makefile.in
@@ -4,17 +4,17 @@
 
 DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
         ActivitiesGlue.js \
         AlertsService.js \
         B2GAboutRedirector.js \
         B2GComponents.manifest \
         ContentHandler.js \
         ContentPermissionPrompt.js \
         DirectoryProvider.js \
         FilePicker.js \
@@ -31,12 +31,12 @@ EXTRA_PP_COMPONENTS = \
 EXTRA_JS_MODULES = \
 	Keyboard.jsm \
 	TelURIParser.jsm \
 	SignInToWebsite.jsm \
 	ErrorPage.jsm \
 	$(NULL)
 
 ifdef MOZ_UPDATER
-EXTRA_PP_COMPONENTS += UpdatePrompt.js
+DISABLED_EXTRA_PP_COMPONENTS += UpdatePrompt.js
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/b2g/components/moz.build
+++ b/b2g/components/moz.build
@@ -7,8 +7,31 @@
 TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'b2g.idl',
 ]
 
 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',
+    ]

--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@@ -8,16 +8,16 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = \
   BrowserComponents.manifest \
   $(NULL)
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
   nsBrowserContentHandler.js \
   nsBrowserGlue.js \
   $(NULL)
 
 EXTRA_JS_MODULES = distribution.js
 
 include $(topsrcdir)/config/rules.mk

--- a/browser/components/feeds/src/Makefile.in
+++ b/browser/components/feeds/src/Makefile.in
@@ -20,16 +20,16 @@ DEFINES += \
 	$(NULL)
 
 DISABLED_EXTRA_COMPONENTS = \
   BrowserFeeds.manifest \
 	FeedConverter.js \
 	WebContentConverter.js \
   $(NULL)
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
 	FeedWriter.js \
 	$(NULL)
 
 
 LOCAL_INCLUDES = -I$(srcdir)/../../build
 
 include $(topsrcdir)/config/rules.mk

--- a/browser/components/feeds/src/moz.build
+++ b/browser/components/feeds/src/moz.build
@@ -10,8 +10,12 @@ CPP_SOURCES += [
     'nsFeedSniffer.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'BrowserFeeds.manifest',
     'FeedConverter.js',
     'WebContentConverter.js',
 ]
+
+EXTRA_PP_COMPONENTS += [
+    'FeedWriter.js',
+]

--- a/browser/components/migration/src/Makefile.in
+++ b/browser/components/migration/src/Makefile.in
@@ -14,37 +14,37 @@ LIBRARY_NAME	= migration_s
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
 DISABLED_EXTRA_COMPONENTS = \
   ProfileMigrator.js \
   FirefoxProfileMigrator.js \
   $(NULL)
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
   ChromeProfileMigrator.js \
   $(NULL)
 
 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)
 
 EXTRA_PP_JS_MODULES = \
 	MigrationUtils.jsm \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/browser/components/migration/src/moz.build
+++ b/browser/components/migration/src/moz.build
@@ -15,8 +15,23 @@ EXTRA_COMPONENTS += [
     'FirefoxProfileMigrator.js',
     'ProfileMigrator.js',
 ]
 
 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',
+    ]

--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -34,8 +34,12 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'browsercompsbase'
 
 MODULE = 'browsercomps'
 
 EXTRA_COMPONENTS += [
     'BrowserComponents.manifest',
 ]
+EXTRA_PP_COMPONENTS += [
+    'nsBrowserContentHandler.js',
+    'nsBrowserGlue.js',
+]

--- a/browser/fuel/src/Makefile.in
+++ b/browser/fuel/src/Makefile.in
@@ -5,11 +5,11 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 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

--- a/browser/fuel/src/moz.build
+++ b/browser/fuel/src/moz.build
@@ -4,8 +4,12 @@
 # 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/.
 
 MODULE = 'fuel'
 
 EXTRA_COMPONENTS += [
     'fuelApplication.manifest',
 ]
+
+EXTRA_PP_COMPONENTS += [
+    'fuelApplication.js',
+]

--- a/browser/metro/components/Makefile.in
+++ b/browser/metro/components/Makefile.in
@@ -6,17 +6,17 @@ DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
 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 \
         BrowserStartup.js \
         DirectoryProvider.js\
         HelperAppDialog.js \
         Sidebar.js \
         SessionStore.js \

--- a/browser/metro/components/moz.build
+++ b/browser/metro/components/moz.build
@@ -5,8 +5,19 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'SessionStore.idl',
 ]
 
 MODULE = 'components'
 
+# metro/components.manifest
+EXTRA_PP_COMPONENTS += [
+    'AboutRedirector.js',
+    'BrowserCLH.js',
+    'BrowserStartup.js',
+    'DirectoryProvider.js',
+    'HelperAppDialog.js',
+    'SessionStore.js',
+    'Sidebar.js',
+    'components.manifest',
+]

--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -29,17 +29,17 @@ FORCE_STATIC_LIB = 1
 EXTRA_COMPONENTS = \
 		contentSecurityPolicy.manifest \
 		contentAreaDropListener.js \
 		contentAreaDropListener.manifest \
 		messageWakeupService.js \
 		messageWakeupService.manifest \
 		$(NULL)
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
 		contentSecurityPolicy.js \
 		$(NULL)
 
 EXTRA_JS_MODULES = \
 		CSPUtils.jsm \
 		$(NULL)
 
 include $(topsrcdir)/config/config.mk

--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -148,8 +148,11 @@ CPP_SOURCES += [
     'nsTreeSanitizer.cpp',
     'nsViewportInfo.cpp',
     'nsXHTMLContentSerializer.cpp',
     'nsXMLContentSerializer.cpp',
     'nsXMLHttpRequest.cpp',
     'nsXMLNameSpaceMap.cpp',
 ]
 
+EXTRA_PP_COMPONENTS += [
+    'contentSecurityPolicy.js',
+]

--- a/dom/apps/src/Makefile.in
+++ b/dom/apps/src/Makefile.in
@@ -10,17 +10,17 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = \
   AppsService.js \
   AppsService.manifest \
   Webapps.manifest \
   $(NULL)
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
   Webapps.js \
   $(NULL)
 
 EXTRA_PP_JS_MODULES += \
   Webapps.jsm \
   AppsUtils.jsm \
   $(NULL)
 

--- a/dom/apps/src/moz.build
+++ b/dom/apps/src/moz.build
@@ -5,16 +5,20 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXTRA_COMPONENTS += [
     'AppsService.js',
     'AppsService.manifest',
     'Webapps.manifest',
 ]
 
+EXTRA_PP_COMPONENTS += [
+    'Webapps.js',
+]
+
 EXTRA_JS_MODULES += [
     'AppDownloadManager.jsm',
     'AppsServiceChild.jsm',
     'FreeSpaceWatcher.jsm',
     'OfflineCacheInstaller.jsm',
     'PermissionsInstaller.jsm',
     'PermissionsTable.jsm',
 ]

--- a/image/decoders/icon/qt/Makefile.in
+++ b/image/decoders/icon/qt/Makefile.in
@@ -14,12 +14,12 @@ LIBXUL_LIBRARY	= 1
 
 
 LOCAL_INCLUDES += $(MOZ_QT_CFLAGS)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 EXTRA_COMPONENTS = gtkqticonsconverter.manifest
-EXTRA_PP_COMPONENTS = gtkqticonsconverter.js
+DISABLED_EXTRA_PP_COMPONENTS = gtkqticonsconverter.js
 
 include $(topsrcdir)/config/rules.mk
 

--- a/image/decoders/icon/qt/moz.build
+++ b/image/decoders/icon/qt/moz.build
@@ -7,8 +7,11 @@
 DIRS += ['public']
 
 MODULE = 'imgicon'
 
 CPP_SOURCES += [
     'nsIconChannel.cpp',
 ]
 
+EXTRA_PP_COMPONENTS += [
+    'gtkqticonsconverter.js',
+]

--- a/mobile/android/components/Makefile.in
+++ b/mobile/android/components/Makefile.in
@@ -4,17 +4,17 @@
 
 DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
         MobileComponents.manifest \
         AboutRedirector.js \
         BrowserCLH.js \
         DirectoryProvider.js\
         HelperAppDialog.js \
         Sidebar.js \
         SessionStore.js \
         $(NULL)

--- a/mobile/android/components/moz.build
+++ b/mobile/android/components/moz.build
@@ -5,8 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'SessionStore.idl',
 ]
 
 MODULE = 'MobileComponents'
 
+EXTRA_PP_COMPONENTS += [
+    'AboutRedirector.js',
+    'BrowserCLH.js',
+    'DirectoryProvider.js',
+    'HelperAppDialog.js',
+    'MobileComponents.manifest',
+    'SessionStore.js',
+    'Sidebar.js',
+]

--- a/services/datareporting/Makefile.in
+++ b/services/datareporting/Makefile.in
@@ -15,17 +15,17 @@ PP_TARGETS += MODULES
 
 TESTING_JS_MODULES := $(addprefix modules-testing/,mocks.jsm)
 TESTING_JS_MODULE_DIR := services/datareporting
 
 EXTRA_COMPONENTS := \
   DataReporting.manifest \
   $(NULL)
 
-EXTRA_PP_COMPONENTS := \
+DISABLED_EXTRA_PP_COMPONENTS := \
   DataReportingService.js \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 $(FINAL_TARGET)/components/DataReportingService.js: policy.jsm sessions.jsm ../common/observers.js
 
 

--- a/services/datareporting/moz.build
+++ b/services/datareporting/moz.build
@@ -1,7 +1,11 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 TEST_DIRS += ['tests']
+
+EXTRA_PP_COMPONENTS += [
+    'DataReportingService.js',
+]

--- a/testing/marionette/components/Makefile.in
+++ b/testing/marionette/components/Makefile.in
@@ -8,14 +8,14 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 ifdef ENABLE_MARIONETTE
 DEFINES += -DENABLE_MARIONETTE=1
 endif
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
     MarionetteComponents.manifest \
     marionettecomponent.js \
     $(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/testing/marionette/components/moz.build
+++ b/testing/marionette/components/moz.build
@@ -1,6 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
+EXTRA_PP_COMPONENTS += [
+    'MarionetteComponents.manifest',
+    'marionettecomponent.js',
+]

--- a/toolkit/components/filepicker/Makefile.in
+++ b/toolkit/components/filepicker/Makefile.in
@@ -14,13 +14,13 @@ include $(DEPTH)/config/autoconf.mk
 ifdef MOZ_XUL
 ifeq (,$(filter android qt os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
 LIBRARY_NAME = fileview
 EXPORT_LIBRARY = 1
 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
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/filepicker/moz.build
+++ b/toolkit/components/filepicker/moz.build
@@ -11,8 +11,11 @@ if CONFIG['MOZ_XUL'] and \
             'nsIFileView.idl',
         ]
         CPP_SOURCES += [
             'nsFileView.cpp',
         ]
         EXTRA_COMPONENTS += [
             'nsFilePicker.js',
         ]
+        EXTRA_PP_COMPONENTS += [
+            'nsFilePicker.manifest',
+        ]

--- a/toolkit/components/passwordmgr/Makefile.in
+++ b/toolkit/components/passwordmgr/Makefile.in
@@ -13,13 +13,13 @@ DISABLED_EXTRA_COMPONENTS = \
   crypto-SDR.js \
   nsLoginInfo.js \
   nsLoginManager.js \
   nsLoginManagerPrompter.js \
   passwordmgr.manifest \
   storage-Legacy.js \
   $(NULL)
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
   storage-mozStorage.js \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/passwordmgr/moz.build
+++ b/toolkit/components/passwordmgr/moz.build
@@ -21,8 +21,12 @@ MODULE = 'loginmgr'
 EXTRA_COMPONENTS += [
     'crypto-SDR.js',
     'nsLoginInfo.js',
     'nsLoginManager.js',
     'nsLoginManagerPrompter.js',
     'passwordmgr.manifest',
     'storage-Legacy.js',
 ]
+
+EXTRA_PP_COMPONENTS += [
+    'storage-mozStorage.js',
+]

--- a/toolkit/components/satchel/Makefile.in
+++ b/toolkit/components/satchel/Makefile.in
@@ -21,17 +21,17 @@ LOCAL_INCLUDES = \
 
 DISABLED_EXTRA_COMPONENTS = \
   nsFormAutoComplete.js \
   FormHistoryStartup.js \
   nsInputListAutoComplete.js \
   satchel.manifest \
   $(NULL)
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
 	nsFormHistory.js \
 	$(NULL)
 
 EXTRA_JS_MODULES = \
   nsFormAutoCompleteResult.jsm \
   $(NULL)
 
 EXTRA_PP_JS_MODULES = \

--- a/toolkit/components/satchel/moz.build
+++ b/toolkit/components/satchel/moz.build
@@ -20,8 +20,12 @@ CPP_SOURCES += [
 ]
 
 EXTRA_COMPONENTS += [
     'FormHistoryStartup.js',
     'nsFormAutoComplete.js',
     'nsInputListAutoComplete.js',
     'satchel.manifest',
 ]
+
+EXTRA_PP_COMPONENTS += [
+    'nsFormHistory.js',
+]

--- a/toolkit/components/search/Makefile.in
+++ b/toolkit/components/search/Makefile.in
@@ -9,15 +9,15 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = \
   toolkitsearch.manifest \
   nsSearchSuggestions.js \
   $(NULL)
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
   nsSearchService.js \
   $(NULL)
 
 DEFINES += -DMOZ_DISTRIBUTION_ID=$(MOZ_DISTRIBUTION_ID)
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/search/moz.build
+++ b/toolkit/components/search/moz.build
@@ -5,8 +5,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
 
 EXTRA_COMPONENTS += [
     'nsSearchSuggestions.js',
     'toolkitsearch.manifest',
 ]
+
+EXTRA_PP_COMPONENTS += [
+    'nsSearchService.js',
+]

--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@@ -17,17 +17,17 @@ MODULE_NAME = telemetry
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 FAIL_ON_WARNINGS = 1
 
 LIBRARY_NAME = telemetry
 MSVC_ENABLE_PGO := 1
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
   TelemetryPing.js \
   $(NULL)
 
 DISABLED_EXTRA_COMPONENTS = \
   TelemetryPing.manifest \
   $(NULL)
 
 EXTRA_JS_MODULES = \

--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -21,8 +21,12 @@ EXPORTS.mozilla += [
 
 CPP_SOURCES += [
     'Telemetry.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'TelemetryPing.manifest',
 ]
+
+EXTRA_PP_COMPONENTS += [
+    'TelemetryPing.js',
+]

--- a/toolkit/components/url-classifier/Makefile.in
+++ b/toolkit/components/url-classifier/Makefile.in
@@ -22,17 +22,17 @@ LOCAL_INCLUDES = \
   $(NULL)
 
 DISABLED_EXTRA_COMPONENTS = \
   nsUrlClassifierHashCompleter.js \
   nsURLClassifier.manifest \
   $(NULL)
 
 # Same as JS components that are run through the pre-processor.
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
   nsUrlClassifierLib.js \
   nsUrlClassifierListManager.js \
   $(NULL)
 
 EXTRA_JS_MODULES = \
   SafeBrowsing.jsm \
   $(NULL)
 

--- a/toolkit/components/url-classifier/moz.build
+++ b/toolkit/components/url-classifier/moz.build
@@ -30,8 +30,14 @@ CPP_SOURCES += [
     'nsUrlClassifierStreamUpdater.cpp',
     'nsUrlClassifierUtils.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'nsURLClassifier.manifest',
     'nsUrlClassifierHashCompleter.js',
 ]
+
+# Same as JS components that are run through the pre-processor.
+EXTRA_PP_COMPONENTS += [
+    'nsUrlClassifierLib.js',
+    'nsUrlClassifierListManager.js',
+]

--- a/toolkit/mozapps/downloads/Makefile.in
+++ b/toolkit/mozapps/downloads/Makefile.in
@@ -6,17 +6,17 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 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 \
   DownloadPaths.jsm \
   DownloadUtils.jsm \
   $(NULL)
 
 EXTRA_PP_JS_MODULES = DownloadTaskbarProgress.jsm

--- a/toolkit/mozapps/downloads/moz.build
+++ b/toolkit/mozapps/downloads/moz.build
@@ -6,8 +6,12 @@
 
 TEST_DIRS += ['tests']
 
 MODULE = 'helperAppDlg'
 
 EXTRA_COMPONENTS += [
     'nsHelperAppDlg.manifest',
 ]
+
+EXTRA_PP_COMPONENTS += [
+    'nsHelperAppDlg.js',
+]

--- a/toolkit/mozapps/extensions/Makefile.in
+++ b/toolkit/mozapps/extensions/Makefile.in
@@ -20,17 +20,17 @@ DEFINES += -DMOZ_EXTENSIONS_DB_SCHEMA=14
 # Additional debugging info is exposed in debug builds, or by setting the
 # MOZ_EM_DEBUG environment variable when building.
 ifneq (,$(MOZ_EM_DEBUG))
 DEFINES += -DMOZ_EM_DEBUG=1
 else ifdef MOZ_DEBUG
 DEFINES += -DMOZ_EM_DEBUG=1
 endif
 
-EXTRA_PP_COMPONENTS = \
+DISABLED_EXTRA_PP_COMPONENTS = \
   nsBlocklistService.js \
   extensions.manifest \
   $(NULL)
 
 DISABLED_EXTRA_COMPONENTS = \
   addonManager.js \
   amContentHandler.js \
   amWebInstallListener.js \

--- a/toolkit/mozapps/extensions/moz.build
+++ b/toolkit/mozapps/extensions/moz.build
@@ -14,8 +14,13 @@ XPIDL_SOURCES += [
 
 MODULE = 'extensions'
 
 EXTRA_COMPONENTS += [
     'addonManager.js',
     'amContentHandler.js',
     'amWebInstallListener.js',
 ]
+
+EXTRA_PP_COMPONENTS += [
+    'extensions.manifest',
+    'nsBlocklistService.js',
+]

--- a/toolkit/mozapps/update/Makefile.in
+++ b/toolkit/mozapps/update/Makefile.in
@@ -11,17 +11,17 @@ include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = \
   nsUpdateTimerManager.js \
   nsUpdateTimerManager.manifest \
   $(NULL)
 
 ifdef MOZ_UPDATER
 
-EXTRA_PP_COMPONENTS += \
+DISABLED_EXTRA_PP_COMPONENTS += \
   nsUpdateService.js \
   nsUpdateServiceStub.js \
   $(NULL)
 
 DISABLED_EXTRA_COMPONENTS += \
   nsUpdateService.manifest \
   $(NULL)
 

--- a/toolkit/mozapps/update/moz.build
+++ b/toolkit/mozapps/update/moz.build
@@ -37,8 +37,14 @@ EXTRA_COMPONENTS += [
     'nsUpdateTimerManager.js',
     'nsUpdateTimerManager.manifest',
 ]
 
 if CONFIG['MOZ_UPDATER']:
     EXTRA_COMPONENTS += [
         'nsUpdateService.manifest',
     ]
+
+if CONFIG['MOZ_UPDATER']:
+    EXTRA_PP_COMPONENTS += [
+        'nsUpdateService.js',
+        'nsUpdateServiceStub.js',
+    ]

--- a/xulrunner/setup/Makefile.in
+++ b/xulrunner/setup/Makefile.in
@@ -5,13 +5,13 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 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)
 
 include $(topsrcdir)/config/rules.mk

--- a/xulrunner/setup/moz.build
+++ b/xulrunner/setup/moz.build
@@ -7,8 +7,11 @@
 XPIDL_SOURCES += [
     'nsIXULAppInstall.idl',
 ]
 
 XPIDL_MODULE = 'xulapp_setup'
 
 MODULE = 'xulrunner'
 
+EXTRA_PP_COMPONENTS += [
+    'nsXULAppInstall.js',
+]