diff --git a/toolkit/Makefile.in b/toolkit/Makefile.in
index af3d447d3ce5..6d6461fc0c25 100644
--- a/toolkit/Makefile.in
+++ b/toolkit/Makefile.in
@@ -52,7 +52,8 @@ DIRS	= \
 		$(NULL)
 
 ifndef MINIMO
-DIRS =  xre \
+DIRS += \
+	xre \
         mozapps \
         $(NULL)
 endif
diff --git a/toolkit/components/build/nsToolkitCompsModule.cpp b/toolkit/components/build/nsToolkitCompsModule.cpp
index 1c2317bf7b97..a1683a24880a 100644
--- a/toolkit/components/build/nsToolkitCompsModule.cpp
+++ b/toolkit/components/build/nsToolkitCompsModule.cpp
@@ -69,7 +69,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserInfo)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAlertsService)
 #endif
 
-#if defined(MOZ_PHOENIX) || defined(MOZ_SUNBIRD) || defined (MINIMO)
+#ifndef MOZ_THUNDERBIRD
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoCompleteController)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoCompleteMdbResult)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsTypeAheadFind)
@@ -89,7 +89,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadProxy)
 
 static void PR_CALLBACK nsToolkitCompModuleDtor(nsIModule* self)
 {
-#ifdef MOZ_PHOENIX
+#ifndef MOZ_THUNDERBIRD
   nsFormHistory::ReleaseInstance();
   nsPasswordManager::Shutdown();
 #endif