Bug 983443 - Cleanup some unused includes in .idl files of comm-central. r+sr=standard8
authoraceman <acelists@atlas.sk>
Tue, 25 Mar 2014 09:32:06 -0400
changeset 19756 edbe40b94a4d60c66d45c3a9d3a163908cdda053
parent 19755 3320c766cf5bcde11d0f6a9c63cf25f0febd24ed
child 19757 7b4c6dfd26751ada3174fc0073658b417be601e1
push id1151
push usermbanner@mozilla.com
push dateMon, 09 Jun 2014 22:14:36 +0000
treeherdercomm-beta@ce127428ad7d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs983443
Bug 983443 - Cleanup some unused includes in .idl files of comm-central. r+sr=standard8
mailnews/addrbook/public/nsIAbCard.idl
mailnews/addrbook/public/nsIAbCollection.idl
mailnews/addrbook/public/nsIAbLDAPAttributeMap.idl
mailnews/base/public/nsICopyMessageListener.idl
mailnews/base/public/nsIMessenger.idl
mailnews/base/public/nsIMessengerMigrator.idl
mailnews/base/public/nsIMsgCopyService.idl
mailnews/base/public/nsIMsgDBView.idl
mailnews/base/public/nsIMsgFolder.idl
mailnews/base/public/nsIMsgFolderCompactor.idl
mailnews/base/public/nsIMsgPluggableStore.idl
mailnews/base/public/nsIMsgPrintEngine.idl
mailnews/base/search/public/nsIMsgFilterPlugin.idl
mailnews/base/search/public/nsIMsgSearchScopeTerm.idl
mailnews/base/search/public/nsIMsgSearchSession.idl
mailnews/base/src/nsMessenger.h
mailnews/base/src/nsMsgCopyService.h
mailnews/base/src/nsMsgDBView.h
mailnews/compose/public/nsIMsgCompose.idl
mailnews/compose/public/nsIMsgSend.idl
mailnews/compose/public/nsIMsgSendLater.idl
mailnews/db/msgdb/public/nsIMsgDatabase.idl
mailnews/imap/public/nsIAutoSyncState.idl
mailnews/imap/public/nsIImapIncomingServer.idl
mailnews/imap/public/nsIImapMailFolderSink.idl
mailnews/imap/public/nsIImapProtocol.idl
mailnews/imap/public/nsIImapService.idl
mailnews/imap/public/nsIImapUrl.idl
mailnews/imap/src/nsImapMailFolder.h
mailnews/import/public/nsIImportAddressBooks.idl
mailnews/import/public/nsIImportMail.idl
mailnews/import/public/nsIImportService.idl
mailnews/local/public/nsIMailboxUrl.idl
mailnews/local/public/nsIMsgParseMailMsgState.idl
mailnews/local/public/nsIPop3Service.idl
mailnews/mime/public/nsIMimeMiscStatus.idl
mailnews/news/public/nsINNTPProtocol.idl
mailnews/news/public/nsINntpService.idl
mailnews/news/public/nsINntpUrl.idl
--- a/mailnews/addrbook/public/nsIAbCard.idl
+++ b/mailnews/addrbook/public/nsIAbCard.idl
@@ -1,14 +1,13 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
-#include "nsISupports.idl"
+
 #include "nsIAbItem.idl"
 
 interface nsISimpleEnumerator;
 interface nsIVariant;
 
 [scriptable, uuid(97448252-F189-11d4-A422-001083003D0C)]
 interface nsIAbPreferMailFormat {
     const unsigned long unknown   = 0;
--- a/mailnews/addrbook/public/nsIAbCollection.idl
+++ b/mailnews/addrbook/public/nsIAbCollection.idl
@@ -1,14 +1,13 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
-#include "nsISupports.idl"
+
 #include "nsIAbItem.idl"
 
 interface nsIAbCard;
 interface nsISimpleEnumerator;
 
 /**
  * A collection of address book items.
  */
--- a/mailnews/addrbook/public/nsIAbLDAPAttributeMap.idl
+++ b/mailnews/addrbook/public/nsIAbLDAPAttributeMap.idl
@@ -1,17 +1,16 @@
 /* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
 
-interface nsISimpleEnumerator;
 interface nsILDAPMessage;
 interface nsIAbCard;
 
 /**
  * A mapping between addressbook properties and ldap attributes.
  *
  * Each addressbook property can map to one or more attributes.  If
  * there is no entry in preferences for a field, the getters generally
--- a/mailnews/base/public/nsICopyMessageListener.idl
+++ b/mailnews/base/public/nsICopyMessageListener.idl
@@ -4,20 +4,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
 #include "MailNewsTypes2.idl"
 
 interface nsIMsgDBHdr;
 interface nsIInputStream;
 
-%{C++
-#include "nsIInputStream.h"
-%}
-
 [scriptable, uuid(53CA78FE-E231-11d2-8A4D-0060B0FC04D2)]
 
 /*  Use this for any object that wants to handle copying/moving messages to it */
 
 interface nsICopyMessageListener :  nsISupports
 {
 	void beginCopy(in nsIMsgDBHdr message);
 	void startMessage();
--- a/mailnews/base/public/nsIMessenger.idl
+++ b/mailnews/base/public/nsIMessenger.idl
@@ -2,18 +2,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
 #include "nsrootidl.idl"
 #include "nsIMsgWindow.idl"
 #include "nsIMsgIdentity.idl"
-#include "nsIMsgThread.idl"
-#include "nsIMsgFolder.idl"
 
 interface nsIMsgDBHdr;
 interface nsIDOMWindow;
 interface nsITransactionManager;
 interface nsIMsgMessageService;
 interface nsIFile;
 interface nsIUrlListener;
 
--- a/mailnews/base/public/nsIMessengerMigrator.idl
+++ b/mailnews/base/public/nsIMessengerMigrator.idl
@@ -1,16 +1,15 @@
 /* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsIMsgIdentity.idl"
 
 [scriptable, uuid(54818d98-1dd2-11b2-82aa-a9197f997503)]
 interface nsIMessengerMigrator: nsISupports {
   /* migrate old mailnews prefs to the 5.x world */
   void UpgradePrefs();
 
-  void createLocalMailAccount(in boolean migrating);          
+  void createLocalMailAccount(in boolean migrating);
 };
 
--- a/mailnews/base/public/nsIMsgCopyService.idl
+++ b/mailnews/base/public/nsIMsgCopyService.idl
@@ -4,21 +4,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsrootidl.idl"
 #include "nsISupports.idl"
 #include "nsIMsgFolder.idl"
 #include "nsIMsgCopyServiceListener.idl"
 
 interface nsIMsgDBHdr;
-%{C++
-#include "nsITransactionManager.h"
-%}
-
-interface nsITransactionManager;
 interface nsIMsgWindow;
 interface nsIFile;
 interface nsIArray;
 
 [scriptable, uuid(f21e428b-73c5-4607-993b-d37325b33722)]
 interface nsIMsgCopyService : nsISupports {
 
   /**
--- a/mailnews/base/public/nsIMsgDBView.idl
+++ b/mailnews/base/public/nsIMsgDBView.idl
@@ -11,17 +11,16 @@ interface nsIMsgWindow;
 interface nsIMessenger;
 interface nsIMsgDBHdr;
 interface nsIMsgThread;
 interface nsIMsgDBViewCommandUpdater;
 interface nsIMsgDatabase;
 interface nsIMsgSearchSession;
 interface nsIMutableArray;
 interface nsISimpleEnumerator;
-interface nsITreeView;
 interface nsIMsgCustomColumnHandler;
 
 typedef long nsMsgViewNotificationCodeValue;
 typedef long nsMsgViewCommandCheckStateValue;
 typedef long nsMsgViewCommandTypeValue;
 typedef long nsMsgNavigationTypeValue;
 
 [scriptable, uuid(682a18be-fd18-11d4-a5be-0060b0fc04b7)]
--- a/mailnews/base/public/nsIMsgFolder.idl
+++ b/mailnews/base/public/nsIMsgFolder.idl
@@ -10,19 +10,16 @@
 #include "nsIUrlListener.idl"
 #include "nsISimpleEnumerator.idl"
 
 interface nsIMsgDBHdr;
 interface nsIMsgWindow;
 interface nsIMsgDatabase;
 interface nsIDBFolderInfo;
 interface nsIMsgFilterList;
-
-interface nsIMsgFolderCacheElement;
-interface nsITransport;
 interface nsIFile;
 interface nsIOutputStream;
 interface nsIInputStream;
 interface nsIFile;
 interface nsIMsgIdentity;
 interface nsIMsgThread;
 interface nsIArray;
 interface nsIMutableArray;
--- a/mailnews/base/public/nsIMsgFolderCompactor.idl
+++ b/mailnews/base/public/nsIMsgFolderCompactor.idl
@@ -1,17 +1,16 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
 
 interface nsIMsgFolder;
-interface nsIMsgDatabase;
 interface nsIMsgWindow;
 interface nsIUrlListener;
 interface nsIArray;
 
 [scriptable, uuid(38c7e876-3083-4aea-8dcd-0ea0ec1753a3)]
 
 /**
  * Use this for any object that wants to handle compacting folders.
--- a/mailnews/base/public/nsIMsgPluggableStore.idl
+++ b/mailnews/base/public/nsIMsgPluggableStore.idl
@@ -5,22 +5,20 @@
 
 #include "nsISupports.idl"
 
 interface nsIFile;
 interface nsIMsgFolder;
 interface nsIMsgCopyServiceListener;
 interface nsIMsgDBHdr;
 interface nsIMsgWindow;
-interface nsISimpleEnumerator;
 interface nsIOutputStream;
 interface nsIInputStream;
 interface nsIArray;
 interface nsIUrlListener;
-interface nsIMsgIncomingServer;
 interface nsIMsgDatabase;
 interface nsITransaction;
 
 [scriptable, uuid(eccf0046-99db-4b08-8e14-29fa254f59c6)]
 
 /**
  * Pluggable message store interface. Each incoming server can have a different
  * message store.
--- a/mailnews/base/public/nsIMsgPrintEngine.idl
+++ b/mailnews/base/public/nsIMsgPrintEngine.idl
@@ -4,17 +4,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsrootidl.idl"
 #include "nsIMsgStatusFeedback.idl"
 
 interface nsIDOMWindow;
 interface nsIPrintSettings;
 interface nsIObserver;
-interface nsIWebBrowserPrint;
 
 [scriptable, uuid(e5f5e4a2-9d74-46b3-ade7-25e1a1ddf54e)]
 interface nsIMsgPrintEngine : nsISupports {
     /**
      * Print/PrintPreview Msg Type
      */
     const short MNAB_START                 = 0;
     const short MNAB_PRINT_MSG             = 0;
--- a/mailnews/base/search/public/nsIMsgFilterPlugin.idl
+++ b/mailnews/base/search/public/nsIMsgFilterPlugin.idl
@@ -2,20 +2,17 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
 #include "MailNewsTypes2.idl"
 
-interface nsIMsgFilterHitNotify;
 interface nsIMsgWindow;
-interface nsIMsgDBHdr;
-interface nsIStreamListener;
 interface nsIFile;
 
 /**
  * This interface is still very much under development, and is not yet stable.
  */
 
 [scriptable, uuid(e2e56690-a676-11d6-80c9-00008646b737)]
 interface nsIMsgFilterPlugin : nsISupports
--- a/mailnews/base/search/public/nsIMsgSearchScopeTerm.idl
+++ b/mailnews/base/search/public/nsIMsgSearchScopeTerm.idl
@@ -1,19 +1,19 @@
 /* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsIMsgSearchSession.idl"
 
-interface nsIFile;
 interface nsIMsgFolder;
 interface nsIMsgDBHdr;
 interface nsILineInputStream;
+interface nsIInputStream;
 
 [scriptable, uuid(934672c3-9b8f-488a-935d-87b4023fa0be)]
 interface nsIMsgSearchScopeTerm : nsISupports {
   nsIInputStream getInputStream(in nsIMsgDBHdr aHdr);
   void closeInputStream();
   readonly attribute nsIMsgFolder folder;
   readonly attribute nsIMsgSearchSession searchSession;
 };
--- a/mailnews/base/search/public/nsIMsgSearchSession.idl
+++ b/mailnews/base/search/public/nsIMsgSearchSession.idl
@@ -8,17 +8,16 @@
 
 interface nsIMsgSearchAdapter;
 interface nsIMsgSearchTerm;
 interface nsIMsgSearchNotify;
 interface nsIMsgHdr;
 interface nsIMsgDatabase;
 interface nsISupportsArray;
 interface nsIMsgWindow;
-interface nsIInputStream;
 
 //////////////////////////////////////////////////////////////////////////////
 // The Msg Search Session is an interface designed to make constructing
 // searches easier. Clients typically build up search terms, and then run
 // the search
 //////////////////////////////////////////////////////////////////////////////
 
 [scriptable, uuid(1ed69bbf-7983-4602-9a9b-2f2263a78878)]
--- a/mailnews/base/src/nsMessenger.h
+++ b/mailnews/base/src/nsMessenger.h
@@ -12,16 +12,17 @@
 #include "nsITransactionManager.h"
 #include "nsIFile.h"
 #include "nsIDocShell.h"
 #include "nsIStringBundle.h"
 #include "nsIFile.h"
 #include "nsWeakReference.h"
 #include "nsIDOMWindow.h"
 #include "nsTArray.h"
+#include "nsIFolderListener.h"
 
 class nsMessenger : public nsIMessenger, public nsSupportsWeakReference, public nsIFolderListener
 {
 
 public:
   nsMessenger();
   virtual ~nsMessenger();
 
--- a/mailnews/base/src/nsMsgCopyService.h
+++ b/mailnews/base/src/nsMsgCopyService.h
@@ -8,16 +8,17 @@
 
 #include "nscore.h"
 #include "nsIMsgCopyService.h"
 #include "nsCOMPtr.h"
 #include "nsIMsgFolder.h"
 #include "nsIMsgHdr.h"
 #include "nsIMsgWindow.h"
 #include "nsIMutableArray.h"
+#include "nsITransactionManager.h"
 #include "nsTArray.h"
 
 typedef enum _nsCopyRequestType
 {
     nsCopyMessagesType = 0x0,
     nsCopyFileMessageType = 0x1,
     nsCopyFoldersType = 0x2
 } nsCopyRequestType;
@@ -50,17 +51,17 @@ public:
                   nsIMsgCopyServiceListener* listener,
                   nsIMsgWindow *msgWindow, bool allowUndo);
     nsCopySource* AddNewCopySource(nsIMsgFolder* srcFolder);
 
     nsCOMPtr<nsISupports> m_srcSupport; // ui source folder or file spec
     nsCOMPtr<nsIMsgFolder> m_dstFolder;
     nsCOMPtr<nsIMsgWindow> m_msgWindow;
     nsCOMPtr<nsIMsgCopyServiceListener> m_listener;
-	nsCOMPtr<nsITransactionManager> m_txnMgr;
+    nsCOMPtr<nsITransactionManager> m_txnMgr;
     nsCopyRequestType m_requestType;
     bool m_isMoveOrDraftOrTemplate;
     bool m_allowUndo;
     bool m_processed;
     uint32_t m_newMsgFlags;
     nsCString m_newMsgKeywords;
     nsString m_dstFolderName;      // used for copy folder.
     nsTArray<nsCopySource*> m_copySourceArray; // array of nsCopySource
--- a/mailnews/base/src/nsMsgDBView.h
+++ b/mailnews/base/src/nsMsgDBView.h
@@ -13,16 +13,17 @@
 #include "nsIMsgHdr.h"
 #include "MailNewsTypes.h"
 #include "nsTArray.h"
 #include "nsIDBChangeListener.h"
 #include "nsITreeView.h"
 #include "nsITreeBoxObject.h"
 #include "nsITreeSelection.h"
 #include "nsIMsgFolder.h"
+#include "nsIMsgThread.h"
 #include "nsIDateTimeFormat.h"
 #include "nsIDOMElement.h"
 #include "nsIAtom.h"
 #include "nsIImapIncomingServer.h"
 #include "nsIWeakReference.h"
 #include "nsIMsgFilterPlugin.h"
 #include "nsIStringBundle.h"
 #include "nsMsgTagService.h"
--- a/mailnews/compose/public/nsIMsgCompose.idl
+++ b/mailnews/compose/public/nsIMsgCompose.idl
@@ -12,17 +12,16 @@
 #include "nsStringGlue.h"
 %}
 
 interface nsIMsgSend;
 interface nsIMsgIdentity;
 interface nsIMsgProgress;
 interface nsIDocShell;
 interface nsIDOMWindow;
-interface nsIDOMNode;
 interface nsIEditor;
 interface nsIMsgWindow;
 
 typedef long MSG_ComposeSaveType;
 
 [scriptable, uuid(6953e50a-7531-11d3-85fe-006008948010)]
 interface nsIMsgCompSaveType {
     const long File     = 0;
--- a/mailnews/compose/public/nsIMsgSend.idl
+++ b/mailnews/compose/public/nsIMsgSend.idl
@@ -22,17 +22,16 @@
 #include "MailNewsTypes2.idl"
 #include "nsIMsgComposeParams.idl"
 
 interface nsIMsgProgress;
 interface nsIURI;
 interface nsIRequest;
 interface nsIMsgDBHdr;
 interface nsIMsgHdr;
-interface nsIDocShell;
 interface nsIFile;
 interface nsIOutputStream;
 interface nsIMsgComposeSecure;
 interface nsIMsgStatusFeedback;
 interface nsIEditor;
 interface nsIArray;
 interface nsISupportsArray;
 
--- a/mailnews/compose/public/nsIMsgSendLater.idl
+++ b/mailnews/compose/public/nsIMsgSendLater.idl
@@ -1,14 +1,13 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsISupports.idl"
 #include "nsIStreamListener.idl"
 
 interface nsIMsgStatusFeedback;
 interface nsIMsgIdentity;
 interface nsIMsgSendLaterListener;
 interface nsIMsgFolder;
 
 /**
--- a/mailnews/db/msgdb/public/nsIMsgDatabase.idl
+++ b/mailnews/db/msgdb/public/nsIMsgDatabase.idl
@@ -33,18 +33,16 @@ interface nsIMsgDBView;
 interface nsIDBChangeListener;
 interface nsIMsgDBHdr;
 interface nsISimpleEnumerator;
 interface nsIMsgThread;
 interface nsIDBFolderInfo;
 interface nsIMsgOfflineImapOperation;
 interface nsIMsgFolder;
 interface nsIMsgKeyArray;
-interface nsIOutputStream;
-interface nsIUrlListener;
 interface nsIFile;
 interface nsIArray;
 
 typedef unsigned long nsMsgRetainByPreference;
 
 
 [scriptable, uuid(0bbe00df-17f8-4e36-8917-40172c3a95fc)]
 
--- a/mailnews/imap/public/nsIAutoSyncState.idl
+++ b/mailnews/imap/public/nsIAutoSyncState.idl
@@ -1,16 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
+
 #include "nsISupports.idl"
 
 interface nsIMsgFolder;
-interface nsIMsgWindow;
 interface nsIArray;
 interface nsIMutableArray;
 
 [scriptable, uuid(7512f927-b8f0-48c4-b101-03e859e61281)]
 interface nsIAutoSyncState : nsISupports {
 
   /**
    * Auto-Sync states.
--- a/mailnews/imap/public/nsIImapIncomingServer.idl
+++ b/mailnews/imap/public/nsIImapIncomingServer.idl
@@ -1,16 +1,15 @@
 /* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
 
-interface nsIUrlListener;
 interface nsIURI;
 interface nsIImapUrl;
 interface nsIImapProtocol;
 interface nsIMsgFolder;
 interface nsIMsgWindow;
 
 typedef long nsMsgImapDeleteModel;
 
--- a/mailnews/imap/public/nsIImapMailFolderSink.idl
+++ b/mailnews/imap/public/nsIImapMailFolderSink.idl
@@ -6,17 +6,16 @@
 #include "nsISupports.idl"
 #include "MailNewsTypes2.idl"
 
 #include "nsIImapProtocol.idl"
 #include "nsIMailboxSpec.idl"
 
 interface nsIMsgMailNewsUrl;
 interface nsIImapMockChannel;
-interface nsIMsgWindow;
 interface nsIImapHeaderXferInfo;
 
 typedef long ImapOnlineCopyState;
 
 [scriptable, uuid(5f7484b0-68b4-11d3-a53e-0060b0fc04b7)]
 interface ImapOnlineCopyStateType
 {
    const long kInProgress = 0;
--- a/mailnews/imap/public/nsIImapProtocol.idl
+++ b/mailnews/imap/public/nsIImapProtocol.idl
@@ -1,17 +1,15 @@
 /* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsIStreamListener.idl"
 
-interface nsIUrlListener;
 interface nsIURI;
 interface nsIImapUrl;
 interface nsIImapProtocol;
 interface nsIImapIncomingServer;
 interface nsIMsgFolder;
 interface nsIImapHostSessionList;
 interface nsIMsgWindow;
 interface nsIImapFlagAndUidState;
--- a/mailnews/imap/public/nsIImapService.idl
+++ b/mailnews/imap/public/nsIImapService.idl
@@ -10,17 +10,16 @@
 //
 // Oh and in case you couldn't tell by the name, the imap service is a service! and you
 // should go through the service manager to obtain an instance of it.
 ////////////////////////////////////////////////////////////////////////////////////////
 
 #include "nsISupports.idl"
 #include "nsIImapUrl.idl"
 
-interface nsIImapProtocol;
 interface nsIImapMessageSink;
 interface nsIUrlListener;
 interface nsIURI;
 interface nsIFile;
 interface nsIMsgFolder;
 interface nsIMsgWindow;
 interface nsIImapIncomingServer;
 interface nsICacheSession;
--- a/mailnews/imap/public/nsIImapUrl.idl
+++ b/mailnews/imap/public/nsIImapUrl.idl
@@ -5,17 +5,16 @@
 
 #include "nsISupports.idl"
 
 interface nsIImapMailFolderSink;
 interface nsIImapMessageSink;
 interface nsIImapServerSink;
 interface nsIImapMockChannel;
 interface nsIFile;
-interface nsIMsgFolder;
 
 typedef long nsImapAction;
 typedef long nsImapState;
 
 typedef unsigned short imapMessageFlagsType;
 
 typedef long nsImapContentModifiedType;
 
--- a/mailnews/imap/src/nsImapMailFolder.h
+++ b/mailnews/imap/src/nsImapMailFolder.h
@@ -19,25 +19,27 @@
 #include "nsITransactionManager.h"
 #include "nsImapUndoTxn.h"
 #include "nsIMsgMessageService.h"
 #include "nsIMsgFilterHitNotify.h"
 #include "nsIMsgFilterList.h"
 #include "prmon.h"
 #include "nsIMsgImapMailFolder.h"
 #include "nsIMsgLocalMailFolder.h"
+#include "nsIMsgThread.h"
 #include "nsIImapMailFolderSink.h"
 #include "nsIImapServerSink.h"
 #include "nsIMsgFilterPlugin.h"
 #include "nsIThread.h"
 #include "nsDataHashtable.h"
 #include "nsIMutableArray.h"
 #include "nsITimer.h"
 #include "nsCOMArray.h"
 #include "nsAutoSyncState.h"
+#include "nsIRequestObserver.h"
 
 class nsImapMoveCoalescer;
 class nsIMsgIdentity;
 class nsIMsgOfflineImapOperation;
 
 #define COPY_BUFFER_SIZE 16384
 
 #define NS_IMAPMAILCOPYSTATE_IID \
--- a/mailnews/import/public/nsIImportAddressBooks.idl
+++ b/mailnews/import/public/nsIImportAddressBooks.idl
@@ -32,17 +32,16 @@
   4) All done, maybe a what was done panel??
 */
 
 #include "nsISupports.idl"
 
 interface   nsIFile;
 interface   nsIArray;
 interface  nsIImportABDescriptor;
-interface  nsIOutputStream;
 interface  nsIAddrDatabase;
 interface  nsIImportFieldMap;
 
 [scriptable, uuid(6bba48be-331c-41e3-bc9f-c2ea3754d977)]
 interface nsIImportAddressBooks : nsISupports
 {
 
   /*
--- a/mailnews/import/public/nsIImportMail.idl
+++ b/mailnews/import/public/nsIImportMail.idl
@@ -33,17 +33,16 @@
 
 */
 
 #include "nsISupports.idl"
 
 interface nsIFile;
 interface nsIArray;
 interface nsIImportMailboxDescriptor;
-interface nsIOutputStream;
 interface nsIMsgFolder;
 
 [scriptable, uuid(a14a3308-0849-420b-86d3-13a2948b5504)]
 interface nsIImportMail : nsISupports
 {
 
   /*
     If found and userVerify BOTH return false, then it is assumed that this
--- a/mailnews/import/public/nsIImportService.idl
+++ b/mailnews/import/public/nsIImportService.idl
@@ -12,19 +12,16 @@
 #include "nsISupports.idl"
 
 interface nsIImportModule;
 interface nsIImportMailboxDescriptor;
 interface nsIImportABDescriptor;
 interface nsIImportGeneric;
 interface nsIImportFieldMap;
 interface nsIMsgSendListener;
-interface nsIMsgCompFields;
-interface nsIMsgSendListener;
-interface nsIArray;
 interface nsIMsgIdentity;
 interface nsIMsgCompFields;
 interface nsIArray;
 
 [scriptable, uuid(d0ed4c50-5997-49c9-8a6a-045f0680ed29)]
 interface nsIImportService : nsISupports
 {
     void DiscoverModules();
--- a/mailnews/local/public/nsIMailboxUrl.idl
+++ b/mailnews/local/public/nsIMailboxUrl.idl
@@ -3,19 +3,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
 #include "MailNewsTypes2.idl"
 
 interface nsIStreamListener;
 interface nsIMsgDBHdr;
-%{C++
-#include "nsIStreamListener.h"
-%}
 
 typedef long nsMailboxAction;
 
 [scriptable, uuid(2ac72280-90f4-4d80-8af1-5e7a1997e2a8)]
 interface nsIMailboxUrl : nsISupports {
 
   // Mailbox urls which parse a mailbox folder require a consumer of the
   // stream which will represent the mailbox. This consumer is the mailbox
--- a/mailnews/local/public/nsIMsgParseMailMsgState.idl
+++ b/mailnews/local/public/nsIMsgParseMailMsgState.idl
@@ -2,22 +2,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
 
 interface nsIMsgDatabase;
 interface nsIMsgDBHdr;
-interface nsIOutputStream;
-
-%{C++
-#include "nsIMsgDatabase.h"
-#include "nsIMsgHdr.h"
-%}
 
 typedef long nsMailboxParseState;
 
 [scriptable, uuid(abf6a8e2-955e-4952-a295-b71d45f770cf)]
 interface nsIMsgParseMailMsgState : nsISupports {
 
     attribute unsigned long envelopePos;
     void SetMailDB(in nsIMsgDatabase aDatabase);
--- a/mailnews/local/public/nsIPop3Service.idl
+++ b/mailnews/local/public/nsIPop3Service.idl
@@ -4,17 +4,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
 #include "nsIUrlListener.idl"
 #include "nsIPop3IncomingServer.idl"
 #include "nsIMsgFolder.idl"
 
 interface nsIURI;
-interface nsIStreamListener;
 interface nsIMsgWindow;
 interface nsIMsgFolder;
 
 [scriptable, uuid(7302fd8e-946f-4ae3-9468-0fb3a7706c51)]
 interface nsIPop3ServiceListener : nsISupports {
   /**
    * Notification that a pop3 download has started.
    *
--- a/mailnews/mime/public/nsIMimeMiscStatus.idl
+++ b/mailnews/mime/public/nsIMimeMiscStatus.idl
@@ -1,19 +1,15 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "nsISupports.idl"
 #include "nsrootidl.idl"
 
-interface nsIOutputStream;
-interface nsIInputStream;
-interface nsIURI;
-interface nsIStreamListener;
 interface nsIChannel;
 interface nsIMsgMailNewsUrl;
 interface nsIUTF8StringEnumerator;
 interface nsIMsgDBHdr;
 interface nsIWritablePropertyBag2;
 
 [scriptable, uuid(4644FB25-5255-11d3-82B8-444553540002)] 
 interface nsIMimeMiscStatus : nsISupports{
--- a/mailnews/news/public/nsINNTPProtocol.idl
+++ b/mailnews/news/public/nsINNTPProtocol.idl
@@ -1,18 +1,16 @@
 /* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
 
-interface nsIUrlListener;
 interface nsIURI;
-interface nsINntpUrl;
 interface nsIMsgFolder;
 interface nsIMsgWindow;
 
 [scriptable, uuid(30106238-0991-11d4-a565-0060b0fc04b7)]
 interface nsINNTPProtocol : nsISupports {
 
   /////////////////////////////////////////////////////////////////////////
   // isBusy is true if the connection is currently processing a url
--- a/mailnews/news/public/nsINntpService.idl
+++ b/mailnews/news/public/nsINntpService.idl
@@ -2,20 +2,18 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
 #include "nsIUrlListener.idl"
 #include "nsINntpIncomingServer.idl"
 #include "MailNewsTypes2.idl"
-#include "nsIMsgIdentity.idl"
 
 interface nsIURI;
-interface nsIStreamListener;  
 interface nsIFile;
 interface nsIMsgWindow;
 interface nsIMsgFolder;
 interface nsICacheSession;
 
 [scriptable, uuid(dc5cadb0-966c-4ef1-a4c8-cc1e48d1ac61)]
 interface nsINntpService : nsISupports {
   
--- a/mailnews/news/public/nsINntpUrl.idl
+++ b/mailnews/news/public/nsINntpUrl.idl
@@ -1,17 +1,16 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
 #include "MailNewsTypes2.idl"
 
-interface nsIMsgDBHdr;
 interface nsINNTPNewsgroupPost;
 
 typedef long nsNewsAction;
 
 /**
  * Represents specific attributes to a URL for news usage.
  *
  * Note that the urls represented by this interface can be one of five schemes: