Fix bustage caused by naving%netscape.com in checkin to fix bug 43411. Filed bug 63087 on inter-module dependencies caused by this fix (which are the cause of the bustage).

mailnews/base/src/nsMsgAccountManager.cpp

@@ -59,6 +59,7 @@
 #include "nsMsgFolderFlags.h"
 #include "nsIRDFService.h"
 #include "nsRDFCID.h"
+#include "nsImapIncomingServer.h" // XXX Should this be here? - bug 63087
 
 #if defined(DEBUG_alecf_) || defined(DEBUG_sspitzer_) || defined(DEBUG_seth_)
 #define DEBUG_ACCOUNTMANAGER 1

mailnews/base/src/nsMsgAccountManager.h

@@ -37,7 +37,6 @@
 #include "nsIObserver.h"
 #include "nsWeakReference.h"
 #include "nsIUrlListener.h"
-#include "nsImapIncomingServer.h"
 
 class nsMsgAccountManager
 	: public nsIMsgAccountManager,

mailnews/imap/src/MANIFEST

@@ -22,4 +22,6 @@
 
 nsImapCore.h
 
+# XXX Should this file really be exported? - bug 63087
+nsImapIncomingServer.h