--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -181,17 +181,16 @@
 #ifdef MOZ_SMIL
 @BINPATH@/components/dom_smil.xpt
 #endif
 @BINPATH@/components/dom_storage.xpt
 @BINPATH@/components/dom_stylesheets.xpt
 @BINPATH@/components/dom_svg.xpt
 @BINPATH@/components/dom_threads.xpt
 @BINPATH@/components/dom_traversal.xpt
-@BINPATH@/components/dom_views.xpt
 @BINPATH@/components/dom_xbl.xpt
 @BINPATH@/components/dom_xpath.xpt
 @BINPATH@/components/dom_xul.xpt
 @BINPATH@/components/downloads.xpt
 @BINPATH@/components/editor.xpt
 @BINPATH@/components/embed_base.xpt
 @BINPATH@/components/extensions.xpt
 @BINPATH@/components/extensions.manifest
@@ -250,17 +249,16 @@
 @BINPATH@/components/pref.xpt
 @BINPATH@/components/prefetch.xpt
 @BINPATH@/components/profile.xpt
 @BINPATH@/components/proxyObject.xpt
 @BINPATH@/components/rdf.xpt
 @BINPATH@/components/satchel.xpt
 @BINPATH@/components/satchel.manifest
 @BINPATH@/components/saxparser.xpt
-@BINPATH@/components/services-crypto.xpt
 @BINPATH@/components/services-crypto-component.xpt
 @BINPATH@/components/shellservice.xpt
 @BINPATH@/components/shistory.xpt
 @BINPATH@/components/smile.xpt
 @BINPATH@/components/spellchecker.xpt
 @BINPATH@/components/startupcache.xpt
 @BINPATH@/components/storage.xpt
 @BINPATH@/components/@DLL_PREFIX@suite@DLL_SUFFIX@
@@ -283,17 +281,16 @@
 #endif
 @BINPATH@/components/uconv.xpt
 @BINPATH@/components/unicharutil.xpt
 @BINPATH@/components/update.xpt
 @BINPATH@/components/uriloader.xpt
 @BINPATH@/components/urlformatter.xpt
 @BINPATH@/components/webBrowser_core.xpt
 @BINPATH@/components/webbrowserpersist.xpt
-@BINPATH@/components/webshell_idls.xpt
 @BINPATH@/components/widget.xpt
 #ifdef XP_MACOSX
 @BINPATH@/components/widget_cocoa.xpt
 #endif
 @BINPATH@/components/windowds.xpt
 @BINPATH@/components/windowwatcher.xpt
 @BINPATH@/components/xpautocomplete.xpt
 @BINPATH@/components/xpcom_base.xpt
@@ -366,17 +363,16 @@
 @BINPATH@/components/nsHelperAppDlg.manifest
 @BINPATH@/components/nsINIProcessor.js
 @BINPATH@/components/nsINIProcessor.manifest
 @BINPATH@/components/nsInputListAutoComplete.js
 @BINPATH@/components/nsLivemarkService.js
 @BINPATH@/components/nsLoginInfo.js
 @BINPATH@/components/nsLoginManager.js
 @BINPATH@/components/nsLoginManagerPrompter.js
-@BINPATH@/components/nsMicrosummaryService.js
 @BINPATH@/components/nsPlacesAutoComplete.js
 @BINPATH@/components/nsPlacesAutoComplete.manifest
 @BINPATH@/components/nsPlacesExpiration.js
 @BINPATH@/components/nsPrompter.js
 @BINPATH@/components/nsPrompter.manifest
 @BINPATH@/components/nsProxyAutoConfig.js
 @BINPATH@/components/nsProxyAutoConfig.manifest
 @BINPATH@/components/nsSearchService.js
@@ -397,20 +393,18 @@
 #ifdef MOZ_UPDATER
 @BINPATH@/components/nsUpdateService.js
 @BINPATH@/components/nsUpdateService.manifest
 @BINPATH@/components/nsUpdateServiceStub.js
 #endif
 @BINPATH@/components/nsUpdateTimerManager.js
 @BINPATH@/components/nsUpdateTimerManager.manifest
 #ifdef MOZ_URL_CLASSIFIER
-#ifndef MOZILLA_5_0_BRANCH
 @BINPATH@/components/nsUrlClassifierHashCompleter.js
 #endif
-#endif
 @BINPATH@/components/nsURLFormatter.js
 @BINPATH@/components/nsURLFormatter.manifest
 @BINPATH@/components/nsWebHandlerApp.js
 @BINPATH@/components/nsWebHandlerApp.manifest
 @BINPATH@/components/passwordmgr.manifest
 @BINPATH@/components/PlacesCategoriesStarter.js
 @BINPATH@/components/pluginGlue.manifest
 @BINPATH@/components/smileApplication.js

--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -109,16 +109,17 @@ components/@DLL_PREFIX@mozfind@DLL_SUFFI
 components/@DLL_PREFIX@myspell@DLL_SUFFIX@
 components/nsCloseAllWindows.js
 components/nsDictionary.js
 components/nsDownloadProgressListener.js
 components/nsExtensionManager.js
 components/nsInterfaceInfoToIDL.js
 components/nsKillAll.js
 components/nsLDAPPrefsService.js
+components/nsMicrosummaryService.js
 components/nsPlacesDBFlush.js
 #ifdef XP_WIN
 components/nsPostUpdateWin.js
 #endif
 components/nsProgressDialog.js
 components/nsResetPref.js
 components/nsScriptableIO.js
 components/nsSetDefaultBrowser.js
@@ -580,17 +581,16 @@ xpicleanup@BIN_SUFFIX@
   components/nsHandlerService.js
   components/nsHelperAppDlg.js
   components/nsINIProcessor.js
   components/nsInputListAutoComplete.js
   components/nsLivemarkService.js
   components/nsLoginInfo.js
   components/nsLoginManager.js
   components/nsLoginManagerPrompter.js
-  components/nsMicrosummaryService.js
   components/nsPlacesAutoComplete.js
   components/nsPlacesDBFlush.js
   components/nsPlacesExpiration.js
   components/nsPrompter.js
   components/nsProxyAutoConfig.js
   components/nsSearchService.js
   components/nsSearchSuggestions.js
   components/nsSessionStartup.js