--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -362,17 +362,16 @@ MAKEFILES_netwerk="
   netwerk/system/win32/Makefile
 "
 
 MAKEFILES_uriloader="
   uriloader/Makefile
   uriloader/base/Makefile
   uriloader/exthandler/Makefile
   uriloader/exthandler/tests/Makefile
-  uriloader/exthandler/tests/browser/Makefile
 "
 
 MAKEFILES_profile="
   profile/Makefile
   profile/public/Makefile
   profile/dirserviceprovider/Makefile
   profile/dirserviceprovider/public/Makefile
   profile/dirserviceprovider/src/Makefile
@@ -608,17 +607,16 @@ MAKEFILES_embedding="
   embedding/browser/chrome/Makefile
   embedding/browser/webBrowser/Makefile
   embedding/browser/gtk/Makefile
   embedding/browser/gtk/src/Makefile
   embedding/browser/gtk/tests/Makefile
   embedding/browser/photon/Makefile
   embedding/browser/photon/src/Makefile
   embedding/browser/photon/tests/Makefile
-  embedding/browser/cocoa/Makefile
   embedding/components/Makefile
   embedding/components/build/Makefile
   embedding/components/windowwatcher/Makefile
   embedding/components/windowwatcher/public/Makefile
   embedding/components/windowwatcher/src/Makefile
   embedding/components/ui/Makefile
   embedding/components/ui/helperAppDlg/Makefile
   embedding/components/ui/progressDlg/Makefile
@@ -684,17 +682,16 @@ MAKEFILES_xulapp="
   toolkit/components/startup/src/Makefile
   toolkit/components/typeaheadfind/Makefile
   toolkit/components/typeaheadfind/public/Makefile
   toolkit/components/typeaheadfind/src/Makefile
   toolkit/components/viewconfig/Makefile
   toolkit/components/viewsource/Makefile
   toolkit/locales/Makefile
   toolkit/mozapps/Makefile
-  toolkit/mozapps/downloads/content/Makefile
   toolkit/mozapps/downloads/Makefile
   toolkit/mozapps/downloads/src/Makefile
   toolkit/mozapps/extensions/Makefile
   toolkit/mozapps/extensions/public/Makefile
   toolkit/mozapps/extensions/src/Makefile
   toolkit/mozapps/update/Makefile
   toolkit/mozapps/update/public/Makefile
   toolkit/mozapps/update/src/Makefile
@@ -703,22 +700,20 @@ MAKEFILES_xulapp="
   toolkit/profile/public/Makefile
   toolkit/profile/skin/Makefile
   toolkit/profile/src/Makefile
   toolkit/themes/Makefile
   toolkit/themes/gnomestripe/global/Makefile
   toolkit/themes/gnomestripe/Makefile
   toolkit/themes/pmstripe/global/Makefile
   toolkit/themes/pmstripe/Makefile
-  toolkit/themes/pinstripe/communicator/Makefile
   toolkit/themes/pinstripe/Makefile
   toolkit/themes/pinstripe/global/Makefile
   toolkit/themes/pinstripe/help/Makefile
   toolkit/themes/pinstripe/mozapps/Makefile
-  toolkit/themes/winstripe/communicator/Makefile
   toolkit/themes/winstripe/Makefile
   toolkit/themes/winstripe/global/Makefile
   toolkit/themes/winstripe/help/Makefile
   toolkit/themes/winstripe/mozapps/Makefile
   toolkit/xre/Makefile
 "
 
 MAKEFILES_libpr0n="
@@ -764,21 +759,16 @@ MAKEFILES_libbz2="
 "
 
 MAKEFILES_libmar="
   modules/libmar/Makefile
   modules/libmar/src/Makefile
   modules/libmar/tool/Makefile
 "
 
-MAKEFILES_themes="
-  themes/Makefile
-  themes/classic/Makefile
-"
-
 add_makefiles "
   $MAKEFILES_db
   $MAKEFILES_dom
   $MAKEFILES_editor
   $MAKEFILES_expat
   $MAKEFILES_gfx
   $MAKEFILES_htmlparser
   $MAKEFILES_intl
@@ -813,17 +803,16 @@ add_makefiles "
   $MAKEFILES_xpfe
   $MAKEFILES_embedding
   $MAKEFILES_xulapp
   $MAKEFILES_libpr0n
   $MAKEFILES_accessible
   $MAKEFILES_zlib
   $MAKEFILES_libbz2
   $MAKEFILES_libmar
-  $MAKEFILES_themes
 "
 
 #
 # Conditional makefiles
 #
 
 if [ "$MOZ_COMPOSER" ]; then
   add_makefiles "