Bug 409964 Clean up some requires and includes in mailnews backend. r/sr=Neil

mailnews/base/public/nsIMsgAccountManager.idl

@@ -40,10 +40,10 @@
 #include "nsIMsgAccount.idl"
 #include "nsIMsgIdentity.idl"
 #include "nsIMsgIncomingServer.idl"
-#include "nsISupportsArray.idl"
 #include "nsIIncomingServerListener.idl"
 #include "nsIMsgFolder.idl"
 
+interface nsISupportsArray;
 interface nsIMsgFolderCache;
 interface nsIFolderListener;
 

mailnews/base/public/nsIMsgFolder.idl

@@ -46,9 +46,6 @@
 #include "nsIUrlListener.idl"
 #include "nsIEnumerator.idl"
 #include "nsISimpleEnumerator.idl"
-%{ C++
-#include "nsIMsgDatabase.h"
-%}
 
 [ptr] native octet_ptr(PRUint8);
 

mailnews/base/search/src/nsMsgBodyHandler.cpp

@@ -44,6 +44,7 @@
 #include "nsIInputStream.h"
 #include "nsILocalFile.h"
 #include "plbase64.h"
+#include "prmem.h"
 
 nsMsgBodyHandler::nsMsgBodyHandler (nsIMsgSearchScopeTerm * scope, PRUint32 offset, PRUint32 numLines, nsIMsgDBHdr* msg, nsIMsgDatabase * db)
 {

mailnews/base/search/src/nsMsgFilter.cpp

@@ -58,6 +58,7 @@
 #include "nsIOutputStream.h"
 #include "nsIStringBundle.h"
 #include "nsDateTimeFormatCID.h"
+#include "prmem.h"
 
 static const char *kImapPrefix = "//imap:";
 static const char *kWhitespace = "\b\t\r\n ";

mailnews/base/search/src/nsMsgFilterDelegateFactory.cpp

@@ -40,7 +40,7 @@
 
 #include "nsCOMPtr.h"
 #include "nsTextFormatter.h"
-
+#include "nsServiceManagerUtils.h"
 #include "nsIRDFService.h"
 #include "nsIRDFResource.h"
 #include "nsRDFCID.h"

mailnews/base/search/src/nsMsgFilterList.cpp

@@ -54,6 +54,7 @@
 #include "nsISupportsObsolete.h"
 #include "nsNetUtil.h"
 #include "nsMsgI18N.h"
+#include "prmem.h"
 
 // unicode "%s" format string
 static const PRUnichar unicodeFormatter[] = {

mailnews/base/search/src/nsMsgImapSearch.cpp

@@ -42,6 +42,7 @@
 #include "nsMsgSearchTerm.h"
 #include "nsIMsgHdr.h"
 #include "nsMsgSearchImap.h"
+#include "prmem.h"
 // Implementation of search for IMAP mail folders
 
 

mailnews/base/search/src/nsMsgSearchAdapter.cpp

@@ -52,6 +52,8 @@
 #include "nsNetCID.h"
 #include "prprf.h"
 #include "nsAutoPtr.h"
+#include "prmem.h"
+#include "MailNewsTypes.h"
 
 // This stuff lives in the base class because the IMAP search syntax
 // is used by the Dredd SEARCH command as well as IMAP itself

mailnews/base/search/src/nsMsgSearchNews.cpp

@@ -45,6 +45,7 @@
 #include "nsMsgSearchNews.h"
 #include "nsIDBFolderInfo.h"
 #include "prprf.h"
+#include "nsIMsgDatabase.h"
 
 // Implementation of search for IMAP mail folders
 

mailnews/base/search/src/nsMsgSearchNews.h

@@ -37,6 +37,7 @@
 
 #ifndef _nsMsgSearchNews_h__
 #include "nsMsgSearchAdapter.h"
+#include "nsMsgKeyArray.h"
 
 //-----------------------------------------------------------------------------
 //---------- Adapter class for searching online (news) folders ----------------

mailnews/base/src/nsMessenger.h

@@ -49,6 +49,7 @@
 #include "nsIObserver.h"
 #include "nsWeakReference.h"
 #include "nsIDOMWindow.h"
+#include "nsVoidArray.h"
 
 class nsMessenger : public nsIMessenger, public nsIObserver, public nsSupportsWeakReference, public nsIFolderListener
 {

mailnews/base/src/nsMessengerBootstrap.cpp

@@ -57,7 +57,7 @@
 #include "nsIURI.h"
 #include "nsIDialogParamBlock.h"
 #include "nsUnicharUtils.h"
-
+#include "nsIMsgDatabase.h"
 #include "nsICommandLine.h"
 #include "nsILocalFile.h"
 #include "nsNetUtil.h"

mailnews/base/src/nsMessengerContentHandler.cpp

@@ -45,6 +45,7 @@
 #include "nsIWebNavigation.h"
 #include "nsIMsgMailSession.h"
 #include "nsMsgBaseCID.h"
+#include "plstr.h"
 
 nsMessengerContentHandler::nsMessengerContentHandler()
 {

mailnews/base/src/nsMessengerOSXIntegration.cpp

@@ -51,7 +51,7 @@
 #include "nsMsgFolderFlags.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsIDirectoryService.h"
-
+#include "MailNewsTypes.h"
 #include "nsIWindowMediator.h"
 #include "nsIDOMChromeWindow.h"
 #include "nsIDOMWindowInternal.h"

mailnews/base/src/nsMessengerUnixIntegration.cpp

@@ -59,7 +59,7 @@
 #include "nsIDocShell.h"
 #include "nsIBaseWindow.h"
 #include "nsIWidget.h"
-
+#include "MailNewsTypes.h"
 #include "nsIMessengerWindowService.h"
 #include "prprf.h"
 #include "nsIWeakReference.h"

mailnews/base/src/nsMessengerWinIntegration.cpp

@@ -65,7 +65,7 @@
 #include "nsIWidget.h"
 #include "nsWidgetsCID.h"
 #include "nsILookAndFeel.h"
-
+#include "MailNewsTypes.h"
 #include "nsIMessengerWindowService.h"
 #include "prprf.h"
 #include "nsIWeakReference.h"

mailnews/base/src/nsMsgAccount.cpp

@@ -42,7 +42,7 @@
 #include "nsISupportsObsolete.h"
 #include "nsIComponentManager.h"
 #include "nsIServiceManager.h"
-
+#include "nsCRTGlue.h"
 #include "nsCOMPtr.h"
 #include "nsReadableUtils.h"
 

mailnews/base/src/nsMsgAccountManager.h

@@ -55,6 +55,7 @@
 #include "nsIUrlListener.h"
 #include "nsCOMArray.h"
 #include "nsInterfaceHashtable.h"
+#include "nsIMsgDatabase.h"
 
 class nsIRDFService;
 

mailnews/base/src/nsMsgFolderCompactor.cpp

@@ -59,6 +59,7 @@
 #include "nsMsgI18N.h"
 #include "prprf.h"
 #include "nsMsgLocalFolderHdrs.h"
+#include "nsIMsgDatabase.h"
 
 static NS_DEFINE_CID(kCMailDB, NS_MAILDB_CID);
 //////////////////////////////////////////////////////////////////////////////

mailnews/base/src/nsMsgFolderDataSource.cpp

@@ -39,7 +39,7 @@
 
 #include "msgCore.h"    // precompiled header...
 #include "prlog.h"
-
+#include "prmem.h"
 #include "nsMsgFolderDataSource.h"
 #include "nsMsgFolderFlags.h"
 

mailnews/base/src/nsMsgMailSession.h

@@ -49,6 +49,7 @@
 #include "nsIObserver.h"
 #include "nsIMutableArray.h"
 #include "nsIMsgProgress.h"
+#include "nsUInt32Array.h"
 
 ///////////////////////////////////////////////////////////////////////////////////
 // The mail session is a replacement for the old 4.x MSG_Master object. It contains

mailnews/base/src/nsMsgProgress.cpp

@@ -46,6 +46,7 @@
 #include "nsNetError.h"
 #include "nsInt64.h"
 #include "nsIWindowWatcher.h"
+#include "nsServiceManagerUtils.h"
 
 NS_IMPL_THREADSAFE_ADDREF(nsMsgProgress)
 NS_IMPL_THREADSAFE_RELEASE(nsMsgProgress)

mailnews/base/src/nsMsgWindow.cpp

@@ -59,7 +59,7 @@
 #include "nsIChannel.h"
 #include "nsIRequestObserver.h"
 #include "netCore.h"
-
+#include "prmem.h"
 #include "plbase64.h"
 #include "nsMsgI18N.h"
 #include "nsIWebNavigation.h"

mailnews/base/util/nsImapMoveCoalescer.h

@@ -42,6 +42,7 @@
 #include "nsISupportsArray.h"
 #include "nsIMsgWindow.h"
 #include "nsCOMPtr.h"
+#include "nsMsgKeyArray.h"
 
 // imap move coalescer class - in order to keep nsImapMailFolder from growing like Topsy
 // Logically, we want to keep track of an nsMsgKeyArray per nsIMsgFolder, and then

mailnews/base/util/nsMsgMailNewsUrl.cpp

@@ -54,6 +54,7 @@
 #include "nsIInputStream.h"
 #include "nsNetUtil.h"
 #include "nsIFile.h"
+#include "prmem.h"
 #include <time.h>
 
 nsMsgMailNewsUrl::nsMsgMailNewsUrl()

mailnews/base/util/nsMsgTxn.cpp

@@ -37,6 +37,7 @@
 
 #include "nsMsgTxn.h"
 #include "nsIMsgHdr.h"
+#include "nsIMsgDatabase.h"
 
 NS_IMPL_ISUPPORTS_INHERITED1(nsMsgTxn, nsHashPropertyBag, nsITransaction)
 

mailnews/compose/src/nsMsgCompose.cpp

@@ -121,6 +121,7 @@
 #include "nsIMsgAccountManager.h"
 #include "nsIMsgProgress.h"
 #include "nsMsgFolderFlags.h"
+#include "nsIMsgDatabase.h"
 
 static void GetReplyHeaderInfo(PRInt32* reply_header_type,
                                nsString& reply_header_locale,

mailnews/compose/src/nsMsgComposeService.cpp

@@ -81,6 +81,7 @@
 #include "nsNetUtil.h"
 #include "nsIMsgMailNewsUrl.h"
 #include "nsIInterfaceRequestorUtils.h"
+#include "nsIMsgDatabase.h"
 
 #ifdef MSGCOMP_TRACE_PERFORMANCE
 #include "prlog.h"

mailnews/compose/src/nsMsgCopy.cpp

@@ -59,6 +59,7 @@
 #include "nsIMsgWindow.h"
 #include "nsIMsgProgress.h"
 #include "nsComposeStrings.h"
+#include "prmem.h"
 
 static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
 

mailnews/db/msgdb/src/Makefile.in

@@ -57,7 +57,6 @@ REQUIRES	= xpcom \
 		  mime \
 		  necko \
 		  pref \
-		  msgimap \
 		  $(NULL)
 
 CPPSRCS		= \

mailnews/db/msgdb/src/nsMailDatabase.cpp

@@ -36,7 +36,6 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "msgCore.h"
-#include "nsImapCore.h" // for imap flags
 #include "nsMailDatabase.h"
 #include "nsDBFolderInfo.h"
 #include "nsMsgLocalFolderHdrs.h"

mailnews/imap/src/nsImapUndoTxn.cpp

@@ -43,6 +43,7 @@
 #include "nsIIMAPHostSessionList.h"
 #include "nsIMsgIncomingServer.h"
 #include "nsIDBFolderInfo.h"
+#include "nsIMsgDatabase.h"
 
 nsImapMoveCopyMsgTxn::nsImapMoveCopyMsgTxn() :
     m_idsAreUids(PR_FALSE), m_isMove(PR_FALSE), m_srcIsPop3(PR_FALSE)

mailnews/import/eudora/src/nsEudoraWin32.cpp

@@ -57,6 +57,8 @@
 #include "nsUnicharUtils.h"
 #include "nsNetUtil.h"
 #include "EudoraDebugLog.h"
+#include "prmem.h"
+#include "plstr.h"
 
 static NS_DEFINE_IID(kISupportsIID,      NS_ISUPPORTS_IID);
 

mailnews/import/src/nsImportMail.cpp

@@ -72,6 +72,8 @@
 #include "nsIImportService.h"
 #include "nsXPCOMCIDInternal.h"
 #include "ImportDebug.h"
+#include "plstr.h"
+#include "MailNewsTypes.h"
 
 #define IMPORT_MSGS_URL       "chrome://messenger/locale/importMsgs.properties"
 

mailnews/local/src/nsLocalUndoTxn.cpp

@@ -46,6 +46,7 @@
 #include "nsIMsgLocalMailFolder.h"
 #include "nsIMsgMailSession.h"
 #include "nsThreadUtils.h"
+#include "nsIMsgDatabase.h"
 
 nsLocalMoveCopyMsgTxn::nsLocalMoveCopyMsgTxn()  : m_srcIsImap4(PR_FALSE)
 {

mailnews/local/src/nsLocalUtils.cpp

@@ -42,7 +42,7 @@
 #include "nsCOMPtr.h"
 #include "nsReadableUtils.h"
 #include "nsEscape.h"
-
+#include "prmem.h"
 // stuff for temporary root folder hack
 #include "nsIMsgAccountManager.h"
 #include "nsIMsgIncomingServer.h"

mailnews/mime/cthandlers/vcard/Makefile.in

@@ -69,7 +69,6 @@ REQUIRES	= xpcom \
 		  intl \
 		  pref \
 		  mailnews \
-		  msgdb \
 		  addrbook \
 		  $(NULL)
 

mailnews/mime/emitters/src/Makefile.in

@@ -57,7 +57,6 @@ REQUIRES	= xpcom \
 		  intl \
 		  locale \
 		  mailnews \
-		  msgdb \
 		  mimetype \
 		  msgnews \
 		  unicharutil \

mailnews/mime/src/Makefile.in

@@ -70,7 +70,6 @@ REQUIRES	= xpcom \
 		  msgimap \
 		  exthandler \
 		  mailnews \
-		  msgdb \
 		  chardet \
 		  caps \
 		  mimetype \
@@ -89,7 +88,7 @@ ifdef BUILD_SMIME
 REQUIRES += \
             msgsmime
 endif
-                  
+
 CPPSRCS		= \
 		nsMimeObjectClassAccess.cpp \
 		nsMimeConverter.cpp \

mailnews/mime/src/mimemcms.cpp

@@ -54,6 +54,7 @@
 #include "nsIMsgSMIMEHeaderSink.h"
 #include "nsCOMPtr.h"
 #include "nsIX509Cert.h"
+#include "plstr.h"
 
 #define MIME_SUPERCLASS mimeMultipartSignedClass
 MimeDefClass(MimeMultipartSignedCMS, MimeMultipartSignedCMSClass,

mailnews/news/src/nsNNTPProtocol.cpp

@@ -65,7 +65,7 @@
 #include "nsMsgNewsCID.h"
 
 #include "nsINntpUrl.h"
-
+#include "prmem.h"
 #include "prtime.h"
 #include "prlog.h"
 #include "prerror.h"