Bug 1416033 - remove some unneeded includes in mailnews/addrbook. r=mkmelin

mailnews/addrbook/public/nsIAbLDAPCard.idl

@@ -2,8 +2,8 @@
 /* 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 "nsIAbCard.idl"
+
+#include "nsISupports.idl"
 
 interface nsIAbLDAPAttributeMap;
 interface nsILDAPModification;

mailnews/addrbook/src/nsAbBSDirectory.cpp

@@ -3,7 +3,6 @@
  * 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 "nsIPrefService.h"
 #include "nsAbBSDirectory.h"
 
 #include "nsDirPrefs.h"

mailnews/addrbook/src/nsAbCardProperty.cpp

@@ -6,7 +6,7 @@
 #include "nsAbCardProperty.h"
 #include "nsAbBaseCID.h"
 #include "nsIPrefService.h"
-#include "nsIAddrDatabase.h"
+#include "nsIAbDirectory.h"
 #include "plbase64.h"
 #include "nsIStringBundle.h"
 #include "plstr.h"

mailnews/addrbook/src/nsAbDirProperty.h

@@ -13,10 +13,8 @@
 #define nsAbDirProperty_h__
 
 #include "nsIAbDirectory.h" /* include the interface we are going to support */
-#include "nsIAbCard.h"
 #include "nsCOMPtr.h"
 #include "nsDirPrefs.h"
-#include "nsIAddrDatabase.h"
 #include "nsString.h"
 #include "nsIPrefBranch.h"
 #include "nsIMutableArray.h"

mailnews/addrbook/src/nsAbLDAPChangeLogData.cpp

@@ -7,7 +7,6 @@
 #include "nsAbLDAPChangeLogData.h"
 #include "nsAbLDAPChangeLogQuery.h"
 #include "nsILDAPMessage.h"
-#include "nsIAbCard.h"
 #include "nsIAddrBookSession.h"
 #include "nsAbBaseCID.h"
 #include "nsAbUtils.h"

mailnews/addrbook/src/nsAbLDAPDirectory.cpp

@@ -8,7 +8,6 @@
 #include "nsAbQueryStringToExpression.h"
 
 #include "nsAbBaseCID.h"
-#include "nsIAbManager.h"
 #include "nsServiceManagerUtils.h"
 #include "nsComponentManagerUtils.h"
 #include "nsNetCID.h"
@@ -18,6 +17,8 @@
 #include "nsEnumeratorUtils.h"
 #include "nsIAbLDAPAttributeMap.h"
 #include "nsIAbMDBDirectory.h"
+#include "nsIAbManager.h"
+#include "nsIAddrDatabase.h"
 #include "nsILDAPURL.h"
 #include "nsILDAPConnection.h"
 #include "nsAppDirectoryServiceDefs.h"

mailnews/addrbook/src/nsAbLDAPDirectoryModify.cpp

@@ -8,7 +8,6 @@
 #include "nsILDAPConnection.h"
 #include "nsILDAPErrors.h"
 #include "nsILDAPModification.h"
-#include "nsIServiceManager.h"
 #include "nsIAbLDAPDirectory.h"
 #include "nsIMutableArray.h"
 #include "nsComponentManagerUtils.h"

mailnews/addrbook/src/nsAbLDAPDirectoryModify.h

@@ -8,7 +8,6 @@
 
 #include "nsAbLDAPListenerBase.h"
 #include "nsIAbLDAPDirectory.h"
-#include "nsILDAPOperation.h"
 #include "nsIArray.h"
 
 class nsILDAPURL;

mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp

@@ -7,7 +7,6 @@
 #include "nsAbBoolExprToLDAPFilter.h"
 #include "nsILDAPMessage.h"
 #include "nsILDAPErrors.h"
-#include "nsILDAPOperation.h"
 #include "nsIAbLDAPAttributeMap.h"
 #include "nsIAbLDAPCard.h"
 #include "nsAbUtils.h"

mailnews/addrbook/src/nsAbLDAPReplicationQuery.cpp

@@ -8,7 +8,6 @@
 #include "nsAbLDAPReplicationQuery.h"
 #include "nsAbLDAPReplicationService.h"
 #include "nsAbLDAPReplicationData.h"
-#include "nsILDAPURL.h"
 #include "nsAbBaseCID.h"
 #include "nsAbUtils.h"
 #include "nsDirPrefs.h"

mailnews/addrbook/src/nsAbLDAPReplicationQuery.h

@@ -6,7 +6,6 @@
 #ifndef nsAbLDAPReplicationQuery_h__
 #define nsAbLDAPReplicationQuery_h__
 
-#include "nsIWebProgressListener.h"
 #include "nsIAbLDAPReplicationQuery.h"
 #include "nsIAbLDAPReplicationData.h"
 #include "nsIAbLDAPDirectory.h"

mailnews/addrbook/src/nsAbMDBDirFactory.cpp

@@ -11,7 +11,6 @@
 #include "nsIAbManager.h"
 #include "nsIAbMDBDirectory.h"
 #include "nsAbMDBDirFactory.h"
-#include "nsIAddrDBListener.h"
 #include "nsIAddrDatabase.h"
 #include "nsEnumeratorUtils.h"
 #include "nsIMutableArray.h"

mailnews/addrbook/src/nsAbMDBDirProperty.cpp

@@ -3,14 +3,12 @@
  * 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 "nsAbMDBDirProperty.h"	
-#include "nsIServiceManager.h"
+#include "nsAbMDBDirProperty.h"
 #include "nsString.h"
 #include "nsCOMPtr.h"
 #include "nsAbBaseCID.h"
 #include "nsAddrDatabase.h"
 #include "nsIAbCard.h"
-#include "nsIAbListener.h"
 #include "nsArrayUtils.h"
 #include "mdb.h"
 #include "nsComponentManagerUtils.h"

mailnews/addrbook/src/nsAbMDBDirectory.cpp

@@ -8,9 +8,7 @@
 #include "nsCOMPtr.h"
 #include "nsAbBaseCID.h"
 #include "nsAddrDatabase.h"
-#include "nsIAbListener.h"
 #include "nsIAbManager.h"
-#include "nsIURL.h"
 #include "nsNetCID.h"
 #include "nsAbDirectoryQuery.h"
 #include "nsIAbDirectoryQueryProxy.h"

mailnews/addrbook/src/nsAbManager.cpp

@@ -6,7 +6,6 @@
 #include "nsAbManager.h"
 #include "nsAbBaseCID.h"
 #include "nsAddrDatabase.h"
-#include "nsIAbMDBDirectory.h"
 #include "nsIOutputStream.h"
 #include "nsNetUtil.h"
 #include "nsMsgI18N.h"
@@ -15,7 +14,6 @@
 #include "nsAppDirectoryServiceDefs.h"
 #include "plstr.h"
 #include "prmem.h"
-#include "nsIServiceManager.h"
 #include "mozIDOMWindow.h"
 #include "plbase64.h"
 #include "nsIWindowWatcher.h"
@@ -31,9 +29,7 @@
 #include "nsIObserverService.h"
 #include "nsDirPrefs.h"
 #include "nsThreadUtils.h"
-#include "nsIAbDirFactory.h"
 #include "nsComponentManagerUtils.h"
-#include "nsIIOService.h"
 #include "nsAbQueryStringToExpression.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Services.h"

mailnews/addrbook/src/nsAbManager.h

@@ -12,7 +12,6 @@
 #include "nsICommandLineHandler.h"
 #include "nsIObserver.h"
 #include "nsInterfaceHashtable.h"
-#include "nsIAbDirFactoryService.h"
 #include "nsIAbDirectory.h"
 #include "nsIFilePicker.h"
 

mailnews/addrbook/src/nsAbOSXDirectory.h

@@ -10,8 +10,6 @@
 #include "nsISupports.h"
 #include "nsAbBaseCID.h"
 #include "nsAbDirProperty.h"
-#include "nsIAbDirectoryQuery.h"
-#include "nsIAbDirectorySearch.h"
 #include "nsIAbDirSearchListener.h"
 #include "nsIMutableArray.h"
 #include "nsInterfaceHashtable.h"

mailnews/addrbook/src/nsAbOutlookDirectory.cpp

@@ -11,7 +11,6 @@
 #include "nsAbDirectoryQuery.h"
 #include "nsIAbBooleanExpression.h"
 #include "nsIAbManager.h"
-#include "nsIAbMDBDirectory.h"
 #include "nsAbQueryStringToExpression.h"
 #include "nsAbUtils.h"
 #include "nsEnumeratorUtils.h"

mailnews/addrbook/src/nsAbView.cpp

@@ -8,14 +8,12 @@
 #include "nsAbView.h"
 #include "nsISupports.h"
 #include "nsCOMPtr.h"
-#include "nsIServiceManager.h"
 #include "nsIAbCard.h"
 #include "prmem.h"
 #include "nsCollationCID.h"
 #include "nsIAbManager.h"
 #include "nsAbBaseCID.h"
 #include "nsXPCOM.h"
-#include "nsISupportsPrimitives.h"
 #include "nsITreeColumns.h"
 #include "nsCRTGlue.h"
 #include "nsIMutableArray.h"
@@ -24,7 +22,7 @@
 #include "nsIStringBundle.h"
 #include "nsIPrefLocalizedString.h"
 #include "nsArrayUtils.h"
-#include "nsIAddrDatabase.h" // for kPriEmailColumn
+#include "nsIAddrDatabase.h" // for kPhoneticNameColumn
 #include "nsMsgUtils.h"
 #include "mozilla/Services.h"
 

mailnews/addrbook/src/nsAddbookProtocolHandler.cpp

@@ -4,9 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "msgCore.h"    // precompiled header...
 #include "nsString.h"
-#include "nsIIOService.h"
 
-#include "nsIStreamListener.h"
 #include "nsAddbookProtocolHandler.h"
 
 #include "nsAddbookUrl.h"
@@ -21,7 +19,6 @@
 #include "nsIAbView.h"
 #include "nsITreeView.h"
 #include "nsIStringBundle.h"
-#include "nsIServiceManager.h"
 #include "mozilla/Services.h"
 #include "nsIAsyncInputStream.h"
 #include "nsIAsyncOutputStream.h"

mailnews/addrbook/src/nsAddbookProtocolHandler.h

@@ -11,7 +11,7 @@
 #include "nsAddbookProtocolHandler.h"
 #include "nsIProtocolHandler.h"
 #include "nsIAddbookUrl.h"
-#include "nsIAddrDatabase.h"
+#include "nsIAbDirectory.h"
 
 class nsAddbookProtocolHandler : public nsIProtocolHandler
 {

mailnews/addrbook/src/nsAddrDatabase.h

@@ -14,7 +14,6 @@
 #include "nsCOMPtr.h"
 #include "nsTObserverArray.h"
 #include "nsWeakPtr.h"
-#include "nsIWeakReferenceUtils.h"
 
 typedef enum
 {