diff --git a/embedding/tests/winEmbed/WebBrowserChrome.cpp b/embedding/tests/winEmbed/WebBrowserChrome.cpp
index f291f6e8158..a7c73905137 100644
--- a/embedding/tests/winEmbed/WebBrowserChrome.cpp
+++ b/embedding/tests/winEmbed/WebBrowserChrome.cpp
@@ -36,15 +36,10 @@
 #include "nsIWebProgress.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIDOMWindow.h"
-#include "nsIDOMWindowInternal.h"
 #include "nsIInterfaceRequestor.h"
-#include "nsIInterfaceRequestorUtils.h"
 #include "nsIRequest.h"
-#include "nsIChannel.h"
 #include "nsCWebBrowser.h"
-#include "nsWidgetsCID.h"
 #include "nsIProfileChangeStatus.h"
-#include "nsCRT.h"
 
 // Local includes
 #include "resource.h"
@@ -380,19 +375,19 @@ WebBrowserChrome::SendHistoryStatusMessage(nsIURI * aURI, char * operation, PRIn
 
     nsString uriAStr;
 
-    if(!(nsCRT::strcmp(operation, "back")))
+    if(!(strcmp(operation, "back")))
     {
         // Going back. XXX Get string from a resource file
         uriAStr.AppendLiteral("Going back to url:");
         uriAStr.Append(NS_ConvertUTF8toUCS2(uriCStr));
     }
-    else if (!(nsCRT::strcmp(operation, "forward")))
+    else if (!(strcmp(operation, "forward")))
     {
         // Going forward. XXX Get string from a resource file
         uriAStr.AppendLiteral("Going forward to url:");
         uriAStr.Append(NS_ConvertUTF8toUCS2(uriCStr));
     }
-    else if (!(nsCRT::strcmp(operation, "reload")))
+    else if (!(strcmp(operation, "reload")))
     {
         // Reloading. XXX Get string from a resource file
         if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_BYPASS_PROXY && 
@@ -414,13 +409,13 @@ WebBrowserChrome::SendHistoryStatusMessage(nsIURI * aURI, char * operation, PRIn
         }
         uriAStr.Append(NS_ConvertASCIItoUCS2(uriCStr));
     }
-    else if (!(nsCRT::strcmp(operation, "add")))
+    else if (!(strcmp(operation, "add")))
     {
         // Adding new entry. XXX Get string from a resource file
         uriAStr.Append(NS_ConvertASCIItoUCS2(uriCStr));
         uriAStr.AppendLiteral(" added to session History");
     }
-    else if (!(nsCRT::strcmp(operation, "goto")))
+    else if (!(strcmp(operation, "goto")))
     {
         // Goto. XXX Get string from a resource file
         uriAStr.AppendLiteral("Going to HistoryIndex:");
@@ -428,7 +423,7 @@ WebBrowserChrome::SendHistoryStatusMessage(nsIURI * aURI, char * operation, PRIn
         uriAStr.AppendLiteral(" Url:");
         uriAStr.Append(NS_ConvertASCIItoUCS2(uriCStr));
     }
-    else if (!(nsCRT::strcmp(operation, "purge")))
+    else if (!(strcmp(operation, "purge")))
     {
         // Purging old entries
         uriAStr.AppendInt(info1);
@@ -530,7 +525,7 @@ NS_IMETHODIMP WebBrowserChrome::GetSiteWindow(void * *aSiteWindow)
 NS_IMETHODIMP WebBrowserChrome::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *someData)
 {
     nsresult rv = NS_OK;
-    if (nsCRT::strcmp(aTopic, "profile-change-teardown") == 0)
+    if (strcmp(aTopic, "profile-change-teardown") == 0)
     {
         // A profile change means death for this window
         WebBrowserChromeUI::Destroy(this);
diff --git a/embedding/tests/winEmbed/WebBrowserChrome.h b/embedding/tests/winEmbed/WebBrowserChrome.h
index 793ce3b8e7f..a7fc178e318 100644
--- a/embedding/tests/winEmbed/WebBrowserChrome.h
+++ b/embedding/tests/winEmbed/WebBrowserChrome.h
@@ -31,14 +31,10 @@
 #define __WebBrowserChrome__
 
 #include "nsCOMPtr.h"
-#include "nsIGenericFactory.h"
 #include "nsString.h"
 #include "nsIWebBrowserChrome.h"
 #include "nsIWebBrowserChromeFocus.h"
 
-#include "nsIDocShell.h"
-#include "nsIContentViewer.h"
-#include "nsIContentViewerFile.h"
 #include "nsIBaseWindow.h"
 #include "nsIEmbeddingSiteWindow.h"
 #include "nsIWebNavigation.h"
diff --git a/embedding/tests/winEmbed/winEmbed.cpp b/embedding/tests/winEmbed/winEmbed.cpp
index ec5ab30e593..fbbc57709a1 100644
--- a/embedding/tests/winEmbed/winEmbed.cpp
+++ b/embedding/tests/winEmbed/winEmbed.cpp
@@ -45,20 +45,16 @@
 
 // Mozilla header files
 #include "nsEmbedAPI.h"
-#include "nsWeakReference.h"
 #include "nsIClipboardCommands.h"
 #include "nsXPIDLString.h"
 #include "nsIWebBrowserPersist.h"
 #include "nsIWebBrowserFocus.h"
 #include "nsIWindowWatcher.h"
-#include "nsIProfile.h"
 #include "nsIObserverService.h"
 #include "nsIObserver.h"
-#include "nsIProfileChangeStatus.h"
 #include "nsIURI.h"
 #include "plstr.h"
 #include "nsIInterfaceRequestor.h"
-#include "nsCRT.h"
 
 #include "nsDirectoryService.h"
 #include "nsDirectoryServiceDefs.h"