diff --git a/mozilla/embedding/browser/webBrowser/Makefile.in b/mozilla/embedding/browser/webBrowser/Makefile.in
index 9cc5a26db4f..7fe655c9eaf 100644
--- a/mozilla/embedding/browser/webBrowser/Makefile.in
+++ b/mozilla/embedding/browser/webBrowser/Makefile.in
@@ -38,7 +38,7 @@ REQUIRES	= xpcom \
 		  necko \
 		  uriloader \
 		  history \
-		  browsercomps \
+		  toolkitcomps \
 		  shistory \
 		  webshell \
 		  windowwatcher \
diff --git a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp
index 3a10e6625ac..93eaabb6830 100644
--- a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp
+++ b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp
@@ -67,7 +67,7 @@
 #include "nsISecureBrowserUI.h"
 
 #ifdef MOZ_PHOENIX
-#include "nsBrowserCompsCID.h"
+#include "nsToolkitCompsCID.h"
 #endif
 
 static NS_DEFINE_CID(kWebShellCID, NS_WEB_SHELL_CID);
diff --git a/mozilla/xpfe/browser/resources/content/sessionHistoryUI.js b/mozilla/xpfe/browser/resources/content/sessionHistoryUI.js
index 951cbf1c0c4..c7f4d5b072a 100644
--- a/mozilla/xpfe/browser/resources/content/sessionHistoryUI.js
+++ b/mozilla/xpfe/browser/resources/content/sessionHistoryUI.js
@@ -167,11 +167,11 @@ function addToUrlbarHistory()
   if (!gRDF)
      gRDF = Components.classes["@mozilla.org/rdf/rdf-service;1"]
                       .getService(Components.interfaces.nsIRDFService);
-
+ 
   if (!gGlobalHistory)
     gGlobalHistory = Components.classes["@mozilla.org/browser/global-history;1"]
                                .getService(Components.interfaces.nsIBrowserHistory);
-  
+
   if (!gURIFixup)
     gURIFixup = Components.classes["@mozilla.org/docshell/urifixup;1"]
                           .getService(Components.interfaces.nsIURIFixup);
diff --git a/mozilla/xpfe/browser/src/Makefile.in b/mozilla/xpfe/browser/src/Makefile.in
index 19dc9771aae..e2ac403af65 100644
--- a/mozilla/xpfe/browser/src/Makefile.in
+++ b/mozilla/xpfe/browser/src/Makefile.in
@@ -51,7 +51,7 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 ifdef MOZ_PHOENIX
-REQUIRES += browsercomps history
+REQUIRES += toolkitcomps history
 endif
 
 CPPSRCS		= \
diff --git a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp
index dae21b0d7b5..da91fbebd69 100644
--- a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp
+++ b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp
@@ -103,7 +103,7 @@
 #include "nsIProxyObjectManager.h" 
 
 #ifdef MOZ_PHOENIX
-#include "nsBrowserCompsCID.h"
+#include "nsToolkitCompsCID.h"
 #endif
 
 #include "nsBrowserStatusFilter.h"