diff --git a/mozilla/mailnews/base/src/nsMsgAccountManager.cpp b/mozilla/mailnews/base/src/nsMsgAccountManager.cpp
index a72d7512cc6..f79260134bc 100644
--- a/mozilla/mailnews/base/src/nsMsgAccountManager.cpp
+++ b/mozilla/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
diff --git a/mozilla/mailnews/base/src/nsMsgAccountManager.h b/mozilla/mailnews/base/src/nsMsgAccountManager.h
index 0aa73de8e82..d57fc835c31 100644
--- a/mozilla/mailnews/base/src/nsMsgAccountManager.h
+++ b/mozilla/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,
diff --git a/mozilla/mailnews/imap/src/MANIFEST b/mozilla/mailnews/imap/src/MANIFEST
index 514e99d18f6..da8d997b09b 100644
--- a/mozilla/mailnews/imap/src/MANIFEST
+++ b/mozilla/mailnews/imap/src/MANIFEST
@@ -22,4 +22,6 @@
 
 nsImapCore.h
 
+# XXX Should this file really be exported? - bug 63087
+nsImapIncomingServer.h