diff --git a/mailnews/base/build/nsMsgFactory.cpp b/mailnews/base/build/nsMsgFactory.cpp
index 59ed97821ae..0d83c1656eb 100644
--- a/mailnews/base/build/nsMsgFactory.cpp
+++ b/mailnews/base/build/nsMsgFactory.cpp
@@ -27,6 +27,7 @@
 #include "nsCRT.h"
 #include "nsCOMPtr.h"
 
+#include "nsMessenger.h"
 #include "nsMsgGroupRecord.h"
 
 #include "nsMsgAppCore.h"
diff --git a/mailnews/base/src/nsMessenger.cpp b/mailnews/base/src/nsMessenger.cpp
index 5f1b7602c17..40fb0fe2ae5 100644
--- a/mailnews/base/src/nsMessenger.cpp
+++ b/mailnews/base/src/nsMessenger.cpp
@@ -17,6 +17,8 @@
  */
 
 #include "nsMessenger.h"
+#include "nsIAppShellService.h"
+#include "nsIServiceManager.h"
 #include "nsMessengerNameSet.h"
 #include "nsIScriptNameSetRegistry.h"
 
@@ -123,24 +125,3 @@ NS_NewMessengerBootstrap(const nsIID &aIID, void ** msgboot)
   return bootstrap->QueryInterface(aIID, msgboot);
 }
 
-// nsMessenger implementation
-
-class nsMessenger : public nsIMessenger {
-
-public:
-    NS_DECL_ISUPPORTS
-};
-
-NS_IMPL_ISUPPORTS(nsMessenger, nsIMessenger::GetIID())
-
-
-nsresult
-NS_NewMessenger(const nsIID &aIID, void **msg)
-{
-  if (!msg) return NS_ERROR_NULL_POINTER;
-  nsMessenger *messenger = 
-  new nsMessenger();
-  if (!messenger) return NS_ERROR_OUT_OF_MEMORY;
-  return messenger->QueryInterface(aIID, msg);
-}
-
diff --git a/mailnews/base/src/nsMessenger.h b/mailnews/base/src/nsMessenger.h
index ad7453616c0..87d78d17a9e 100644
--- a/mailnews/base/src/nsMessenger.h
+++ b/mailnews/base/src/nsMessenger.h
@@ -21,7 +21,6 @@
 #define __nsMessenger_h
 
 #include "nscore.h"
-#include "nsIMessenger.h"
 #include "nsIServiceManager.h"
 #include "nsIAppShellService.h"
 
@@ -38,8 +37,6 @@
 
 NS_BEGIN_EXTERN_C
 
-nsresult NS_NewMessenger(const nsIID &aIID, void **inst);
-
 nsresult NS_NewMessengerBootstrap(const nsIID &aIID, void ** inst);
 
 NS_END_EXTERN_C
diff --git a/mailnews/base/src/nsMessengerNameSet.cpp b/mailnews/base/src/nsMessengerNameSet.cpp
index e59f0f5ee98..658f9b8c16d 100644
--- a/mailnews/base/src/nsMessengerNameSet.cpp
+++ b/mailnews/base/src/nsMessengerNameSet.cpp
@@ -24,7 +24,6 @@
 #include "nsIScriptContext.h"
 #include "nsIScriptNameSpaceManager.h"
 #include "nsIScriptExternalNameSet.h"
-#include "nsMessenger.h"
 
 
 /* hack the AppCore stuff here */