diff --git a/mozilla/mailnews/base/search/public/nsMsgSearchAdapter.h b/mozilla/mailnews/base/search/public/nsMsgSearchAdapter.h
index 3a0286f8f24..c200130fb9f 100644
--- a/mozilla/mailnews/base/search/public/nsMsgSearchAdapter.h
+++ b/mozilla/mailnews/base/search/public/nsMsgSearchAdapter.h
@@ -30,8 +30,9 @@
 #include "nsIMsgSearchValidityManager.h"
 #include "nsIMsgSearchTerm.h"
 #include "nsMsgSearchArray.h"
+#include "nsINntpIncomingServer.h"
+
 class nsIMsgSearchScopeTerm;
-class nsINNTPHost;
 
 //-----------------------------------------------------------------------------
 // These Adapter classes contain the smarts to convert search criteria from 
@@ -175,7 +176,7 @@ public:
   
 	nsresult GetTable (int, nsMsgSearchValidityTable**);
   
-	nsresult PostProcessValidityTable (nsINNTPHost*);
+	nsresult PostProcessValidityTable (nsINntpIncomingServer *);
 
 protected:
 
@@ -197,7 +198,7 @@ protected:
 	nsresult InitOnlineMailFilterTable ();
 	nsresult InitNewsTable ();
 	nsresult InitLocalNewsTable(); 
-	nsresult InitNewsExTable (nsINNTPHost *host = nsnull);
+	nsresult InitNewsExTable (nsINntpIncomingServer *host = nsnull);
 
 	void EnableLdapAttribute (nsMsgSearchAttribValue, PRBool enabled = PR_TRUE);
 };
diff --git a/mozilla/mailnews/base/search/src/nsMsgSearchNews.cpp b/mozilla/mailnews/base/search/src/nsMsgSearchNews.cpp
index cf61bef5025..7cf948ab002 100644
--- a/mozilla/mailnews/base/search/src/nsMsgSearchNews.cpp
+++ b/mozilla/mailnews/base/search/src/nsMsgSearchNews.cpp
@@ -27,7 +27,6 @@
 #include "nsMsgSearchTerm.h"
 #include "nsIMsgHdr.h"
 #include "nsMsgSearchNews.h"
-#include "nsINNTPHost.h"
 #include "nsIDBFolderInfo.h"
 
 // Implementation of search for IMAP mail folders
@@ -708,7 +707,7 @@ nsresult nsMsgSearchValidityManager::InitNewsTable ()
 }
 
 
-nsresult nsMsgSearchValidityManager::InitNewsExTable (nsINNTPHost *newsHost)
+nsresult nsMsgSearchValidityManager::InitNewsExTable (nsINntpIncomingServer *newsHost)
 {
 	nsresult err = NS_OK;
 
@@ -793,7 +792,7 @@ nsresult nsMsgSearchValidityManager::InitNewsExTable (nsINNTPHost *newsHost)
 }
 
 
-nsresult nsMsgSearchValidityManager::PostProcessValidityTable (nsINNTPHost *host)
+nsresult nsMsgSearchValidityManager::PostProcessValidityTable (nsINntpIncomingServer *host)
 {
 	return InitNewsExTable (host);
 }