Bug 1600545 - Remove useless inclusions of header files generated from IDL files in modules/, netwerk/, parser/, security/, startupcache/, storage/, toolkit/, tools/, uriloader/, widget/, xpcom/ and xpfe/ r=Ehsan

The inclusions were removed with the following very crude script and the
resulting breakage was fixed up by hand. The manual fixups did either
revert the changes done by the script, replace a generic header with a more
specific one or replace a header with a forward declaration.

find . -name "*.idl" | grep -v web-platform | grep -v third_party | while read path; do
    interfaces=$(grep "^\(class\|interface\).*:.*" "$path" | cut -d' ' -f2)
    if [ -n "$interfaces" ]; then
        if [[ "$interfaces" == *$'\n'* ]]; then
          regexp="\("
          for i in $interfaces; do regexp="$regexp$i\|"; done
          regexp="${regexp%%\\\|}\)"
        else
          regexp="$interfaces"
        fi
        interface=$(basename "$path")
        rg -l "#include.*${interface%%.idl}.h" . | while read path2; do
            hits=$(grep -v "#include.*${interface%%.idl}.h" "$path2" | grep -c "$regexp" )
            if [ $hits -eq 0 ]; then
                echo "Removing ${interface} from ${path2}"
                grep -v "#include.*${interface%%.idl}.h" "$path2" > "$path2".tmp
                mv -f "$path2".tmp "$path2"
            fi
        done
    fi
done

Differential Revision: https://phabricator.services.mozilla.com/D55444

--HG--
extra : moz-landing-system : lando

modules/libjar/nsJAR.cpp

@@ -7,7 +7,7 @@
 #include "nsJARInputStream.h"
 #include "nsJAR.h"
 #include "nsIFile.h"
-#include "nsIConsoleService.h"
+#include "nsIObserverService.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Omnijar.h"
 #include "mozilla/Unused.h"

modules/libjar/nsJAR.h

@@ -14,7 +14,6 @@
 
 #include "mozilla/Atomics.h"
 #include "mozilla/Mutex.h"
-#include "nsIComponentManager.h"
 #include "nsCOMPtr.h"
 #include "nsClassHashtable.h"
 #include "nsString.h"
@@ -25,7 +24,6 @@
 #include "nsTHashtable.h"
 #include "nsIZipReader.h"
 #include "nsZipArchive.h"
-#include "nsIObserverService.h"
 #include "nsWeakReference.h"
 #include "nsIObserver.h"
 #include "mozilla/Attributes.h"

modules/libjar/nsJARChannel.cpp

@@ -10,21 +10,15 @@
 #include "nsMimeTypes.h"
 #include "nsNetUtil.h"
 #include "nsEscape.h"
-#include "nsIPrefService.h"
-#include "nsIPrefBranch.h"
-#include "nsIViewSourceChannel.h"
 #include "nsContentUtils.h"
 #include "nsProxyRelease.h"
 #include "nsContentSecurityManager.h"
 
-#include "nsIScriptSecurityManager.h"
-#include "nsIPrincipal.h"
 #include "nsIFileURL.h"
 
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/IntegerPrintfMacros.h"
 #include "mozilla/Preferences.h"
-#include "nsIBrowserChild.h"
 #include "private/pprio.h"
 #include "nsInputStreamPump.h"
 #include "nsThreadUtils.h"

modules/libjar/nsJARInputStream.cpp

@@ -14,7 +14,6 @@
 #include "MmapFaultHandler.h"
 
 #include "nsEscape.h"
-#include "nsIFile.h"
 #include "nsDebug.h"
 #include <algorithm>
 #if defined(XP_WIN)

modules/libjar/nsJARProtocolHandler.cpp

@@ -6,12 +6,8 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "nsAutoPtr.h"
 #include "nsJARProtocolHandler.h"
-#include "nsIIOService.h"
 #include "nsCRT.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
 #include "nsJARURI.h"
-#include "nsIURL.h"
 #include "nsJARChannel.h"
 #include "nsString.h"
 #include "nsNetCID.h"

modules/libjar/nsJARProtocolHandler.h

@@ -8,7 +8,6 @@
 
 #include "mozilla/StaticPtr.h"
 #include "nsIProtocolHandler.h"
-#include "nsIJARURI.h"
 #include "nsIZipReader.h"
 #include "nsIMIMEService.h"
 #include "nsWeakReference.h"

modules/libjar/nsJARURI.cpp

@@ -11,9 +11,6 @@
 #include "nsIIOService.h"
 #include "nsIStandardURL.h"
 #include "nsCRT.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsIZipReader.h"
 #include "nsReadableUtils.h"
 #include "nsAutoPtr.h"
 #include "nsNetCID.h"

modules/libjar/zipwriter/nsDeflateConverter.cpp

@@ -6,7 +6,6 @@
 #include "StreamFunctions.h"
 #include "nsDeflateConverter.h"
 #include "nsStringStream.h"
-#include "nsIInputStreamPump.h"
 #include "nsComponentManagerUtils.h"
 #include "nsMemory.h"
 #include "plstr.h"

modules/libjar/zipwriter/nsDeflateConverter.h

@@ -8,7 +8,6 @@
 
 #include "nsIStreamConverter.h"
 #include "nsCOMPtr.h"
-#include "nsIPipe.h"
 #include "zlib.h"
 #include "mozilla/Attributes.h"
 

modules/libjar/zipwriter/nsZipWriter.cpp

@@ -10,10 +10,8 @@
 #include "StreamFunctions.h"
 #include "nsZipDataStream.h"
 #include "nsISeekableStream.h"
-#include "nsIAsyncStreamCopier.h"
 #include "nsIStreamListener.h"
 #include "nsIInputStreamPump.h"
-#include "nsILoadInfo.h"
 #include "nsComponentManagerUtils.h"
 #include "nsMemory.h"
 #include "nsError.h"

modules/libjar/zipwriter/nsZipWriter.h

@@ -7,8 +7,6 @@
 #define _nsZipWriter_h_
 
 #include "nsIZipWriter.h"
-#include "nsIFileStreams.h"
-#include "nsIBufferedStreams.h"
 #include "nsIRequestObserver.h"
 #include "nsZipHeader.h"
 #include "nsCOMPtr.h"

modules/libpref/Preferences.cpp

@@ -54,11 +54,8 @@
 #include "nsDataHashtable.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsHashKeys.h"
-#include "nsICategoryManager.h"
 #include "nsIConsoleService.h"
-#include "nsIDirectoryService.h"
 #include "nsIFile.h"
-#include "nsIInputStream.h"
 #include "nsIMemoryReporter.h"
 #include "nsIObserver.h"
 #include "nsIObserverService.h"
@@ -69,7 +66,6 @@
 #include "nsISafeOutputStream.h"
 #include "nsISimpleEnumerator.h"
 #include "nsIStringBundle.h"
-#include "nsIStringEnumerator.h"
 #include "nsISupportsImpl.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIZipReader.h"

netwerk/base/BackgroundFileSaver.cpp

@@ -11,6 +11,7 @@
 #include "mozilla/Logging.h"
 #include "mozilla/Telemetry.h"
 #include "nsCOMArray.h"
+#include "nsComponentManagerUtils.h"
 #include "nsDependentSubstring.h"
 #include "nsIAsyncInputStream.h"
 #include "nsIFile.h"

netwerk/base/ChannelDiverterChild.cpp

@@ -10,7 +10,6 @@
 #include "mozilla/net/FTPChannelChild.h"
 #include "mozilla/net/PHttpChannelChild.h"
 #include "mozilla/net/PFTPChannelChild.h"
-#include "nsIDivertableChannel.h"
 
 namespace mozilla {
 namespace net {}  // namespace net

netwerk/base/Dashboard.cpp

@@ -14,7 +14,6 @@
 #include "nsIInputStream.h"
 #include "nsINamed.h"
 #include "nsISocketTransport.h"
-#include "nsIThread.h"
 #include "nsProxyRelease.h"
 #include "nsSocketTransportService2.h"
 #include "nsThreadUtils.h"

netwerk/base/Dashboard.h

@@ -9,10 +9,6 @@
 #include "mozilla/net/DashboardTypes.h"
 #include "nsIDashboard.h"
 #include "nsIDashboardEventNotifier.h"
-#include "nsIDNSListener.h"
-#include "nsIServiceManager.h"
-#include "nsITimer.h"
-#include "nsITransport.h"
 
 class nsIDNSService;
 

netwerk/base/IOActivityMonitor.cpp

@@ -4,8 +4,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 "IOActivityMonitor.h"
-#include "nsIObserverService.h"
-#include "nsPISocketTransportService.h"
 #include "nsPrintfCString.h"
 #include "nsSocketTransport2.h"
 #include "nsSocketTransportService2.h"

netwerk/base/LoadInfo.cpp

@@ -25,7 +25,6 @@
 #include "nsIDocShell.h"
 #include "mozilla/dom/Document.h"
 #include "nsCookiePermission.h"
-#include "nsICookieService.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsISupportsImpl.h"
 #include "nsISupportsUtils.h"

netwerk/base/LoadInfo.h

@@ -8,7 +8,6 @@
 #define mozilla_LoadInfo_h
 
 #include "nsIContentSecurityPolicy.h"
-#include "nsIContentPolicy.h"
 #include "nsILoadInfo.h"
 #include "nsIPrincipal.h"
 #include "nsIWeakReferenceUtils.h"  // for nsWeakPtr

netwerk/base/NetworkConnectivityService.cpp

@@ -7,7 +7,6 @@
 #include "mozilla/Services.h"
 #include "xpcpublic.h"
 #include "nsSocketTransport2.h"
-#include "nsIURIMutator.h"
 #include "nsINetworkLinkService.h"
 
 static LazyLogModule gNCSLog("NetworkConnectivityService");

netwerk/base/Predictor.cpp

@@ -9,7 +9,6 @@
 
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsICacheStorage.h"
-#include "nsICacheStorageService.h"
 #include "nsICachingChannel.h"
 #include "nsICancelable.h"
 #include "nsIChannel.h"
@@ -19,14 +18,11 @@
 #include "nsIFile.h"
 #include "nsIHttpChannel.h"
 #include "nsIInputStream.h"
-#include "nsIIOService.h"
 #include "nsILoadContext.h"
 #include "nsILoadContextInfo.h"
 #include "nsILoadGroup.h"
 #include "nsINetworkPredictorVerifier.h"
 #include "nsIObserverService.h"
-#include "nsIPrefBranch.h"
-#include "nsIPrefService.h"
 #include "nsISpeculativeConnect.h"
 #include "nsITimer.h"
 #include "nsIURI.h"

netwerk/base/SimpleBuffer.h

@@ -15,7 +15,6 @@
 
 #include "prtypes.h"
 #include "mozilla/LinkedList.h"
-#include "nsIThreadInternal.h"
 
 namespace mozilla {
 namespace net {

netwerk/base/TLSServerSocket.cpp

@@ -10,7 +10,6 @@
 #include "nsComponentManagerUtils.h"
 #include "nsDependentSubstring.h"
 #include "nsIServerSocket.h"
-#include "nsITimer.h"
 #include "nsIX509Cert.h"
 #include "nsIX509CertDB.h"
 #include "nsNetCID.h"

netwerk/base/Tickler.cpp

@@ -8,8 +8,6 @@
 #ifdef MOZ_USE_WIFI_TICKLER
 #  include "nsComponentManagerUtils.h"
 #  include "nsINamed.h"
-#  include "nsIPrefBranch.h"
-#  include "nsIPrefService.h"
 #  include "nsServiceManagerUtils.h"
 #  include "nsThreadUtils.h"
 #  include "prnetdb.h"

netwerk/base/nsAsyncRedirectVerifyHelper.h

@@ -7,9 +7,7 @@
 #define nsAsyncRedirectVerifyHelper_h
 
 #include "nsIRunnable.h"
-#include "nsIThread.h"
 #include "nsIChannelEventSink.h"
-#include "nsIInterfaceRequestor.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"

netwerk/base/nsBaseChannel.cpp

@@ -12,7 +12,6 @@
 #include "nsUnknownDecoder.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsMimeTypes.h"
-#include "nsIHttpChannel.h"
 #include "nsIChannelEventSink.h"
 #include "nsIStreamConverterService.h"
 #include "nsChannelClassifier.h"

netwerk/base/nsDirectoryIndexStream.cpp

@@ -17,7 +17,6 @@
 #include "nsDirectoryIndexStream.h"
 #include "mozilla/Logging.h"
 #include "prtime.h"
-#include "nsISimpleEnumerator.h"
 #ifdef THREADSAFE_I18N
 #  include "nsCollationCID.h"
 #  include "nsICollation.h"

netwerk/base/nsDownloader.cpp

@@ -4,7 +4,6 @@
 
 #include "nsDownloader.h"
 #include "nsIInputStream.h"
-#include "nsIOutputStream.h"
 #include "nsDirectoryServiceUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsNetUtil.h"

netwerk/base/nsIOService.cpp

@@ -15,7 +15,6 @@
 #include "nsErrorService.h"
 #include "netCore.h"
 #include "nsIObserverService.h"
-#include "nsIPrefService.h"
 #include "nsXPCOM.h"
 #include "nsIProxiedProtocolHandler.h"
 #include "nsIProxyInfo.h"
@@ -28,18 +27,15 @@
 #include "nsIConsoleService.h"
 #include "nsIUploadChannel2.h"
 #include "nsXULAppAPI.h"
-#include "nsIScriptSecurityManager.h"
 #include "nsIProtocolProxyCallback.h"
 #include "nsICancelable.h"
 #include "nsINetworkLinkService.h"
-#include "nsPISocketTransportService.h"
 #include "nsAsyncRedirectVerifyHelper.h"
 #include "nsURLHelper.h"
 #include "nsIProtocolProxyService2.h"
 #include "MainThreadUtils.h"
 #include "nsINode.h"
 #include "nsIWidget.h"
-#include "nsIHttpChannel.h"
 #include "nsThreadUtils.h"
 #include "mozilla/LoadInfo.h"
 #include "mozilla/net/NeckoCommon.h"

netwerk/base/nsInputStreamPump.cpp

@@ -7,7 +7,6 @@
 #include "nsIOService.h"
 #include "nsInputStreamPump.h"
 #include "nsIStreamTransportService.h"
-#include "nsISeekableStream.h"
 #include "nsITransport.h"
 #include "nsIThreadRetargetableStreamListener.h"
 #include "nsThreadUtils.h"

netwerk/base/nsLoadGroup.cpp

@@ -18,7 +18,6 @@
 #include "nsITimedChannel.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIRequestObserver.h"
-#include "nsIRequestContext.h"
 #include "CacheObserver.h"
 #include "MainThreadUtils.h"
 #include "RequestContextService.h"

netwerk/base/nsMIMEInputStream.h

@@ -11,8 +11,6 @@
 #ifndef _nsMIMEInputStream_h_
 #define _nsMIMEInputStream_h_
 
-#include "nsIMIMEInputStream.h"
-
 #define NS_MIMEINPUTSTREAM_CONTRACTID "@mozilla.org/network/mime-input-stream;1"
 #define NS_MIMEINPUTSTREAM_CID                       \
   { /* 58a1c31c-1dd2-11b2-a3f6-d36949d48268 */       \

netwerk/base/nsNetUtil.cpp

@@ -27,7 +27,6 @@
 #include "nsHashKeys.h"
 #include "nsHttp.h"
 #include "nsMimeTypes.h"
-#include "nsIAsyncStreamCopier.h"
 #include "nsIAuthPrompt.h"
 #include "nsIAuthPrompt2.h"
 #include "nsIAuthPromptAdapterFactory.h"
@@ -36,7 +35,6 @@
 #include "nsIChannelEventSink.h"
 #include "nsIContentSniffer.h"
 #include "mozilla/dom/Document.h"
-#include "nsICookieService.h"
 #include "nsIDownloader.h"
 #include "nsIFileProtocolHandler.h"
 #include "nsIFileStreams.h"
@@ -47,7 +45,6 @@
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsILoadContext.h"
 #include "nsIMIMEHeaderParam.h"
-#include "nsIMutable.h"
 #include "nsINode.h"
 #include "nsIObjectLoadingContent.h"
 #include "nsIOfflineCacheUpdate.h"
@@ -57,21 +54,15 @@
 #include "nsIProtocolProxyService.h"
 #include "mozilla/net/RedirectChannelRegistrar.h"
 #include "nsRequestObserverProxy.h"
-#include "nsIScriptSecurityManager.h"
 #include "nsISensitiveInfoHiddenURI.h"
 #include "nsISimpleStreamListener.h"
 #include "nsISocketProvider.h"
-#include "nsISocketProviderService.h"
 #include "nsIStandardURL.h"
 #include "nsIStreamLoader.h"
 #include "nsIIncrementalStreamLoader.h"
-#include "nsIStreamTransportService.h"
 #include "nsStringStream.h"
 #include "nsSyncStreamListener.h"
-#include "nsITransport.h"
 #include "nsIURIWithSpecialOrigin.h"
-#include "nsIURLParser.h"
-#include "nsIUUIDGenerator.h"
 #include "nsIViewSourceChannel.h"
 #include "nsInterfaceRequestorAgg.h"
 #include "plstr.h"

netwerk/base/nsPACMan.cpp

@@ -12,7 +12,6 @@
 #include "nsIAuthPrompt.h"
 #include "nsIDHCPClient.h"
 #include "nsIHttpChannel.h"
-#include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsIPromptFactory.h"
 #include "nsIProtocolProxyService.h"

netwerk/base/nsProtocolProxyService.cpp

@@ -19,8 +19,6 @@
 #include "nsICancelable.h"
 #include "nsIDNSService.h"
 #include "nsPIDNSService.h"
-#include "nsIScriptSecurityManager.h"
-#include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsContentUtils.h"
 #include "nsThreadUtils.h"

netwerk/base/nsProtocolProxyService.h

@@ -14,7 +14,6 @@
 #include "nsIProtocolProxyFilter.h"
 #include "nsIProxyInfo.h"
 #include "nsIObserver.h"
-#include "nsIThread.h"
 #include "nsDataHashtable.h"
 #include "nsHashKeys.h"
 #include "prio.h"

netwerk/base/nsSocketTransportService2.cpp

@@ -13,8 +13,6 @@
 #include "nsError.h"
 #include "prnetdb.h"
 #include "prerror.h"
-#include "nsIPrefService.h"
-#include "nsIPrefBranch.h"
 #include "nsServiceManagerUtils.h"
 #include "nsIObserverService.h"
 #include "mozilla/Atomics.h"

netwerk/base/nsStandardURL.h

@@ -11,7 +11,6 @@
 #include "nsIFileURL.h"
 #include "nsIStandardURL.h"
 #include "mozilla/Encoding.h"
-#include "nsIObserver.h"
 #include "nsCOMPtr.h"
 #include "nsURLHelper.h"
 #include "nsIClassInfo.h"

netwerk/base/nsStreamListenerWrapper.h

@@ -7,7 +7,6 @@
 
 #include "nsCOMPtr.h"
 #include "nsIStreamListener.h"
-#include "nsIRequestObserver.h"
 #include "nsIThreadRetargetableStreamListener.h"
 #include "mozilla/Attributes.h"
 

netwerk/base/nsStreamTransportService.cpp

@@ -12,7 +12,6 @@
 
 #include "nsIAsyncInputStream.h"
 #include "nsIAsyncOutputStream.h"
-#include "nsISeekableStream.h"
 #include "nsIPipe.h"
 #include "nsITransport.h"
 #include "nsIObserverService.h"

netwerk/base/nsSyncStreamListener.cpp

@@ -4,7 +4,6 @@
 
 #include "nsIOService.h"
 #include "nsSyncStreamListener.h"
-#include "nsIPipe.h"
 #include "nsThreadUtils.h"
 #include <algorithm>
 

netwerk/base/nsUDPSocket.cpp

@@ -24,7 +24,6 @@
 #include "IOActivityMonitor.h"
 #include "nsServiceManagerUtils.h"
 #include "nsStreamUtils.h"
-#include "nsIPipe.h"
 #include "prerror.h"
 #include "nsThreadUtils.h"
 #include "nsIDNSRecord.h"

netwerk/base/nsURLHelperWin.cpp

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* Windows-specific local file uri parsing */
+#include "nsComponentManagerUtils.h"
 #include "nsURLHelper.h"
 #include "nsEscape.h"
 #include "nsIFile.h"

netwerk/build/nsNetModule.cpp

@@ -13,9 +13,6 @@
 #include "nsIClassInfoImpl.h"
 #include "mozilla/Components.h"
 #include "mozilla/ModuleUtils.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsICategoryManager.h"
 #include "nscore.h"
 #include "nsSimpleURI.h"
 #include "nsLoadGroup.h"
@@ -25,7 +22,6 @@
 #include "nsCategoryCache.h"
 #include "nsIContentSniffer.h"
 #include "nsStandardURL.h"
-#include "nsIThreadPool.h"
 #include "mozilla/net/BackgroundChannelRegistrar.h"
 #include "mozilla/net/NeckoChild.h"
 #include "RedirectChannelRegistrar.h"

netwerk/cache/nsApplicationCacheService.cpp

@@ -10,7 +10,6 @@
 #include "nsNetCID.h"
 #include "nsNetUtil.h"
 #include "nsIObserverService.h"
-#include "nsIPrincipal.h"
 #include "mozilla/LoadContextInfo.h"
 
 using namespace mozilla;

netwerk/cache/nsCacheEntry.cpp

@@ -12,7 +12,6 @@
 #include "nsCacheRequest.h"
 #include "nsThreadUtils.h"
 #include "nsError.h"
-#include "nsICacheService.h"
 #include "nsCacheService.h"
 #include "nsCacheDevice.h"
 #include "nsHashKeys.h"

netwerk/cache/nsCacheEntry.h

@@ -9,7 +9,6 @@
 
 #include "nsICache.h"
 #include "nsICacheEntryDescriptor.h"
-#include "nsIThread.h"
 #include "nsCacheMetaData.h"
 
 #include "nspr.h"
@@ -24,6 +23,7 @@ class nsCacheDevice;
 class nsCacheMetaData;
 class nsCacheRequest;
 class nsCacheEntryDescriptor;
+class nsIEventTarget;
 
 /******************************************************************************
  * nsCacheEntry

netwerk/cache/nsCacheService.cpp

@@ -23,9 +23,7 @@
 #include "nsDiskCacheDeviceSQL.h"
 #include "nsCacheUtils.h"
 #include "../cache2/CacheObserver.h"
-#include "nsINamed.h"
 #include "nsIObserverService.h"
-#include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsIFile.h"
 #include "nsIOService.h"
@@ -37,8 +35,6 @@
 #include "nsNetCID.h"
 #include <math.h>  // for log()
 #include "mozilla/Services.h"
-#include "nsITimer.h"
-#include "mozIStorageService.h"
 #include "mozilla/StaticPrefs_browser.h"
 
 #include "mozilla/net/NeckoCommon.h"

netwerk/cache/nsCacheService.h

@@ -15,7 +15,6 @@
 #include "nsICacheListener.h"
 
 #include "prthread.h"
-#include "nsIObserver.h"
 #include "nsString.h"
 #include "nsTArray.h"
 #include "nsRefPtrHashtable.h"

netwerk/cache/nsDeleteDir.cpp

@@ -9,7 +9,6 @@
 #include "nsString.h"
 #include "mozilla/Telemetry.h"
 #include "nsITimer.h"
-#include "nsISimpleEnumerator.h"
 #include "nsAutoPtr.h"
 #include "nsThreadUtils.h"
 #include "nsISupportsPriority.h"

netwerk/cache/nsDiskCacheDeviceSQL.cpp

@@ -24,7 +24,6 @@
 #include "nsAutoPtr.h"
 #include "nsEscape.h"
 #include "nsIPrefBranch.h"
-#include "nsIPrefService.h"
 #include "nsString.h"
 #include "nsPrintfCString.h"
 #include "nsCRT.h"

netwerk/cache/nsDiskCacheDeviceSQL.h

@@ -8,8 +8,6 @@
 
 #include "nsCacheDevice.h"
 #include "nsIApplicationCache.h"
-#include "nsIApplicationCacheService.h"
-#include "nsIObserver.h"
 #include "mozIStorageConnection.h"
 #include "mozIStorageFunction.h"
 #include "nsIFile.h"

netwerk/cache2/CacheEntry.cpp

@@ -16,7 +16,6 @@
 #include "nsICacheEntryOpenCallback.h"
 #include "nsICacheStorage.h"
 #include "nsISerializable.h"
-#include "nsIStreamTransportService.h"
 #include "nsISizeOf.h"
 
 #include "nsComponentManagerUtils.h"

netwerk/cache2/CacheFileContextEvictor.cpp

@@ -12,7 +12,6 @@
 #include "LoadContextInfo.h"
 #include "nsThreadUtils.h"
 #include "nsString.h"
-#include "nsISimpleEnumerator.h"
 #include "nsIDirectoryEnumerator.h"
 #include "mozilla/Base64.h"
 #include "mozilla/IntegerPrintfMacros.h"

netwerk/cache2/CacheFileIOManager.cpp

@@ -16,10 +16,8 @@
 #include "nsIFile.h"
 #include "CacheFileContextEvictor.h"
 #include "nsITimer.h"
-#include "nsISimpleEnumerator.h"
 #include "nsIDirectoryEnumerator.h"
 #include "nsIObserverService.h"
-#include "nsICacheStorageVisitor.h"
 #include "nsISizeOf.h"
 #include "mozilla/net/MozURL.h"
 #include "mozilla/Telemetry.h"

netwerk/cache2/CacheIndex.cpp

@@ -10,8 +10,6 @@
 #include "CacheIndexIterator.h"
 #include "CacheIndexContextIterator.h"
 #include "nsThreadUtils.h"
-#include "nsISimpleEnumerator.h"
-#include "nsIDirectoryEnumerator.h"
 #include "nsISizeOf.h"
 #include "nsPrintfCString.h"
 #include "mozilla/DebugOnly.h"

netwerk/cache2/CacheStorage.h

@@ -14,7 +14,6 @@
 #include "nsCOMPtr.h"
 #include "nsILoadContextInfo.h"
 #include "nsIApplicationCache.h"
-#include "nsICacheEntryDoomCallback.h"
 
 class nsIURI;
 class nsIApplicationCache;

netwerk/cookie/CookieServiceChild.cpp

@@ -26,7 +26,6 @@
 #include "nsCookiePermission.h"
 #include "nsIEffectiveTLDService.h"
 #include "nsIURI.h"
-#include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsServiceManagerUtils.h"
 #include "mozilla/Telemetry.h"

netwerk/cookie/CookieServiceParent.cpp

@@ -13,9 +13,6 @@
 #include "nsArrayUtils.h"
 #include "nsCookieService.h"
 #include "nsIChannel.h"
-#include "nsIEffectiveTLDService.h"
-#include "nsIScriptSecurityManager.h"
-#include "nsIPrivateBrowsingChannel.h"
 #include "nsNetCID.h"
 #include "nsPrintfCString.h"
 

netwerk/cookie/nsCookie.h

@@ -13,6 +13,7 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/net/NeckoChannelParams.h"
+#include "nsIMemoryReporter.h"
 
 using mozilla::OriginAttributes;
 

netwerk/cookie/nsCookiePermission.cpp

@@ -7,19 +7,13 @@
 #include "nsCookiePermission.h"
 
 #include "nsICookie.h"
-#include "nsIServiceManager.h"
-#include "nsICookieManager.h"
 #include "nsICookieService.h"
 #include "nsNetUtil.h"
 #include "nsIInterfaceRequestorUtils.h"
-#include "nsIProtocolHandler.h"
 #include "nsIURI.h"
 #include "nsIChannel.h"
-#include "nsIHttpChannelInternal.h"
-#include "nsIPrincipal.h"
 #include "nsString.h"
 #include "nsCRT.h"
-#include "nsILoadContext.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsNetCID.h"
 #include "prtime.h"

netwerk/cookie/nsCookieService.cpp

@@ -20,17 +20,9 @@
 #include "nsCookieService.h"
 #include "nsContentUtils.h"
 #include "nsIClassifiedChannel.h"
-#include "nsIServiceManager.h"
-#include "nsIScriptSecurityManager.h"
 #include "nsIWebProgressListener.h"
 #include "nsIHttpChannel.h"
 
-#include "nsIIOService.h"
-#include "nsIPermissionManager.h"
-#include "nsIProtocolHandler.h"
-#include "nsIPrefBranch.h"
-#include "nsIPrefService.h"
-#include "nsIScriptError.h"
 #include "nsCookiePermission.h"
 #include "nsIURI.h"
 #include "nsIURL.h"
@@ -40,7 +32,10 @@
 #include "nsILineInputStream.h"
 #include "nsIEffectiveTLDService.h"
 #include "nsIIDNService.h"
-#include "nsIThread.h"
+#include "mozIStorageBindingParamsArray.h"
+#include "mozIStorageError.h"
+#include "mozIStorageFunction.h"
+#include "mozIStorageService.h"
 #include "mozIThirdPartyUtil.h"
 
 #include "nsTArray.h"

netwerk/cookie/nsCookieService.h

@@ -21,13 +21,9 @@
 #include "nsTHashtable.h"
 #include "mozIStorageStatement.h"
 #include "mozIStorageAsyncStatement.h"
-#include "mozIStoragePendingStatement.h"
 #include "mozIStorageConnection.h"
-#include "mozIStorageRow.h"
 #include "mozIStorageCompletionCallback.h"
 #include "mozIStorageStatementCallback.h"
-#include "mozIStorageFunction.h"
-#include "nsIVariant.h"
 #include "nsIFile.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/BasePrincipal.h"

netwerk/dns/ChildDNSService.cpp

@@ -4,11 +4,8 @@
 
 #include "mozilla/net/ChildDNSService.h"
 #include "nsIDNSListener.h"
-#include "nsIIOService.h"
-#include "nsIThread.h"
 #include "nsThreadUtils.h"
 #include "nsIXPConnect.h"
-#include "nsIPrefService.h"
 #include "nsIProtocolProxyService.h"
 #include "nsNetCID.h"
 #include "mozilla/ClearOnShutdown.h"

netwerk/dns/DNSListenerProxy.cpp

@@ -6,7 +6,6 @@
 
 #include "mozilla/net/DNSListenerProxy.h"
 #include "nsICancelable.h"
-#include "nsIEventTarget.h"
 
 namespace mozilla {
 namespace net {

netwerk/dns/DNSRequestChild.cpp

@@ -16,7 +16,6 @@
 #include "nsHostResolver.h"
 #include "nsTArray.h"
 #include "nsNetAddr.h"
-#include "nsIThread.h"
 #include "nsThreadUtils.h"
 
 using namespace mozilla::ipc;

netwerk/dns/DNSRequestParent.cpp

@@ -8,7 +8,6 @@
 #include "nsIDNSService.h"
 #include "nsNetCID.h"
 #include "nsThreadUtils.h"
-#include "nsIServiceManager.h"
 #include "nsICancelable.h"
 #include "nsIDNSRecord.h"
 #include "nsHostResolver.h"

netwerk/dns/DNSRequestParent.h

@@ -8,7 +8,6 @@
 #define mozilla_net_DNSRequestParent_h
 
 #include "mozilla/net/PDNSRequestParent.h"
-#include "nsIDNSService.h"
 #include "nsIDNSListener.h"
 
 namespace mozilla {

netwerk/dns/TRRService.cpp

@@ -7,7 +7,6 @@
 #include "nsIParentalControlsService.h"
 #include "nsINetworkLinkService.h"
 #include "nsIObserverService.h"
-#include "nsIURIMutator.h"
 #include "nsNetUtil.h"
 #include "nsStandardURL.h"
 #include "TRR.h"

netwerk/dns/mdns/libmdns/MDNSResponderReply.h

@@ -9,7 +9,6 @@
 #include "dns_sd.h"
 #include "MDNSResponderOperator.h"
 #include "mozilla/UniquePtr.h"
-#include "nsIThread.h"
 #include "mozilla/net/DNS.h"
 #include "mozilla/RefPtr.h"
 #include "nsThreadUtils.h"

netwerk/dns/nsDNSService2.cpp

@@ -9,9 +9,7 @@
 #include "nsIDNSListener.h"
 #include "nsIDNSByTypeRecord.h"
 #include "nsICancelable.h"
-#include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
-#include "nsIServiceManager.h"
 #include "nsIXPConnect.h"
 #include "nsProxyRelease.h"
 #include "nsReadableUtils.h"

netwerk/dns/nsIDNService.cpp

@@ -11,9 +11,6 @@
 #include "nsUnicodeProperties.h"
 #include "nsUnicodeScriptCodes.h"
 #include "harfbuzz/hb.h"
-#include "nsIServiceManager.h"
-#include "nsIObserverService.h"
-#include "nsISupportsPrimitives.h"
 #include "punycode.h"
 #include "mozilla/TextUtils.h"
 #include "mozilla/Utf8.h"

netwerk/dns/nsIDNService.h

@@ -8,7 +8,6 @@
 
 #include "nsIIDNService.h"
 #include "nsCOMPtr.h"
-#include "nsIObserver.h"
 #include "nsUnicodeScriptCodes.h"
 #include "nsWeakReference.h"
 

netwerk/ipc/DocumentLoadListener.cpp

@@ -20,7 +20,6 @@
 #include "nsDocShell.h"
 #include "nsDocShellLoadState.h"
 #include "nsHttpChannel.h"
-#include "nsIHttpProtocolHandler.h"
 #include "nsISecureBrowserUI.h"
 #include "nsRedirectHistoryEntry.h"
 #include "nsSerializationHelper.h"

netwerk/ipc/NeckoMessageUtils.h

@@ -15,7 +15,6 @@
 #include "nsString.h"
 #include "prio.h"
 #include "mozilla/net/DNS.h"
-#include "nsILoadInfo.h"
 
 namespace IPC {
 

netwerk/ipc/NeckoTargetHolder.cpp

@@ -8,7 +8,6 @@
 #include "NeckoTargetHolder.h"
 
 #include "nsContentUtils.h"
-#include "nsILoadInfo.h"
 
 namespace mozilla {
 namespace net {

netwerk/ipc/SocketProcessChild.cpp

@@ -20,6 +20,7 @@
 #include "mozilla/ipc/PParentToChildStreamChild.h"
 #include "mozilla/Preferences.h"
 #include "nsDebugImpl.h"
+#include "nsIDNSService.h"
 #include "nsThreadManager.h"
 #include "ProcessUtils.h"
 #include "SocketProcessBridgeParent.h"

netwerk/mime/nsMIMEHeaderParamImpl.cpp

@@ -14,7 +14,6 @@
 #include "nsTArray.h"
 #include "nsCOMPtr.h"
 #include "nsEscape.h"
-#include "nsIServiceManager.h"
 #include "nsMIMEHeaderParamImpl.h"
 #include "nsReadableUtils.h"
 #include "nsNativeCharsetUtils.h"

netwerk/protocol/about/nsAboutCache.cpp

@@ -5,7 +5,6 @@
 
 #include "nsAboutCache.h"
 #include "nsIInputStream.h"
-#include "nsIStorageStream.h"
 #include "nsIURI.h"
 #include "nsCOMPtr.h"
 #include "nsNetUtil.h"

netwerk/protocol/about/nsAboutCacheEntry.cpp

@@ -19,7 +19,6 @@
 #include "nsInputStreamPump.h"
 #include "CacheFileUtils.h"
 #include <algorithm>
-#include "nsIPipe.h"
 
 using namespace mozilla::net;
 

netwerk/protocol/data/nsDataModule.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 "nsIModule.h"
 #include "nsIGenericFactory.h"
 #include "nsDataHandler.h"
 

netwerk/protocol/ftp/FTPChannelParent.cpp

@@ -16,7 +16,6 @@
 #include "nsFtpProtocolHandler.h"
 #include "nsIAuthPrompt.h"
 #include "nsIAuthPromptProvider.h"
-#include "nsIEncodedChannel.h"
 #include "nsIHttpChannelInternal.h"
 #include "nsISecureBrowserUI.h"
 #include "nsIForcePendingChannel.h"
@@ -24,7 +23,6 @@
 #include "mozilla/ipc/URIUtils.h"
 #include "mozilla/Unused.h"
 #include "SerializedLoadContext.h"
-#include "nsIContentPolicy.h"
 #include "mozilla/ipc/BackgroundUtils.h"
 #include "mozilla/LoadInfo.h"
 #include "mozilla/dom/ContentParent.h"

netwerk/protocol/ftp/nsFtpConnectionThread.cpp

@@ -28,20 +28,15 @@
 #include "nsStreamUtils.h"
 #include "nsIURL.h"
 #include "nsISocketTransport.h"
-#include "nsIStreamListenerTee.h"
-#include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsAuthInformationHolder.h"
 #include "nsIProtocolProxyService.h"
 #include "nsICancelable.h"
 #include "nsIOutputStream.h"
-#include "nsIPrompt.h"
 #include "nsIProtocolHandler.h"
 #include "nsIProxyInfo.h"
-#include "nsIRunnable.h"
 #include "nsISocketTransportService.h"
 #include "nsIURI.h"
-#include "nsIURIMutator.h"
 #include "nsILoadInfo.h"
 #include "nsIAuthPrompt2.h"
 #include "nsIFTPChannelParentInternal.h"

netwerk/protocol/ftp/nsFtpControlConnection.cpp

@@ -11,7 +11,6 @@
 #include "nsISocketTransportService.h"
 #include "nsISocketTransport.h"
 #include "nsThreadUtils.h"
-#include "nsIOutputStream.h"
 #include "nsNetCID.h"
 #include "nsTArray.h"
 #include <algorithm>

netwerk/protocol/ftp/nsFtpProtocolHandler.cpp

@@ -10,9 +10,7 @@ using namespace mozilla::net;
 
 #include "nsFtpProtocolHandler.h"
 #include "nsFTPChannel.h"
-#include "nsIStandardURL.h"
 #include "mozilla/Logging.h"
-#include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsIObserverService.h"
 #include "nsEscape.h"

netwerk/protocol/gio/nsGIOProtocolHandler.cpp

@@ -11,19 +11,16 @@
 #include "mozilla/Components.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/NullPrincipal.h"
-#include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsIObserver.h"
 #include "nsThreadUtils.h"
 #include "nsProxyRelease.h"
 #include "nsIStringBundle.h"
-#include "nsIStandardURL.h"
 #include "nsMimeTypes.h"
 #include "nsNetCID.h"
 #include "nsNetUtil.h"
 #include "nsServiceManagerUtils.h"
 #include "nsIURI.h"
-#include "nsIURIMutator.h"
 #include "nsIAuthPrompt.h"
 #include "nsIChannel.h"
 #include "nsIInputStream.h"

netwerk/protocol/http/BackgroundChannelRegistrar.cpp

@@ -8,7 +8,6 @@
 
 #include "HttpBackgroundChannelParent.h"
 #include "HttpChannelParent.h"
-#include "nsIInterfaceRequestor.h"
 #include "nsXULAppAPI.h"
 #include "mozilla/StaticPtr.h"
 

netwerk/protocol/http/ClassifierDummyChannel.h

@@ -9,6 +9,7 @@
 #define mozilla_net_ClassifierDummyChannel_h
 
 #include "nsIChannel.h"
+#include "nsIHttpChannelInternal.h"
 #include <functional>
 
 #define CLASSIFIER_DUMMY_CHANNEL_IID                 \

netwerk/protocol/http/ClassifierDummyChannelChild.cpp

@@ -7,7 +7,6 @@
 #include "ClassifierDummyChannelChild.h"
 #include "mozilla/ipc/BackgroundUtils.h"
 #include "mozilla/ipc/URIUtils.h"
-#include "nsIChannel.h"
 #include "nsIURI.h"
 
 namespace mozilla {

netwerk/protocol/http/ClassifierDummyChannelParent.cpp

@@ -7,7 +7,6 @@
 #include "ClassifierDummyChannelParent.h"
 #include "mozilla/net/AsyncUrlChannelClassifier.h"
 #include "mozilla/Unused.h"
-#include "nsIChannel.h"
 #include "nsIPrincipal.h"
 #include "nsNetUtil.h"
 

netwerk/protocol/http/Http2Compression.h

@@ -12,7 +12,6 @@
 #include "mozilla/Attributes.h"
 #include "nsDeque.h"
 #include "nsString.h"
-#include "nsIMemoryReporter.h"
 #include "mozilla/Telemetry.h"
 
 namespace mozilla {

netwerk/protocol/http/Http2Push.h

@@ -16,7 +16,6 @@
 #include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtr.h"
 #include "nsHttpRequestHead.h"
-#include "nsILoadGroup.h"
 #include "nsIRequestContext.h"
 #include "nsString.h"
 #include "PSpdyPush.h"

netwerk/protocol/http/Http2Stream.cpp

@@ -28,8 +28,6 @@
 #include "nsHttpHandler.h"
 #include "nsHttpRequestHead.h"
 #include "nsIClassOfService.h"
-#include "nsIPipe.h"
-#include "nsISocketTransport.h"
 #include "nsStandardURL.h"
 #include "prnetdb.h"
 

netwerk/protocol/http/HttpAuthUtils.cpp

@@ -4,7 +4,6 @@
 
 #include "mozilla/net/HttpAuthUtils.h"
 #include "mozilla/Tokenizer.h"
-#include "nsIPrefService.h"
 #include "nsIURI.h"
 #include "nsNetUtil.h"
 #include "nsUnicharUtils.h"

netwerk/protocol/http/HttpBaseChannel.cpp

@@ -27,7 +27,6 @@
 #include "nsIEncodedChannel.h"
 #include "nsIApplicationCacheChannel.h"
 #include "nsIMutableArray.h"
-#include "nsIURIMutator.h"
 #include "nsEscape.h"
 #include "nsStreamListenerWrapper.h"
 #include "nsISecurityConsoleMessage.h"
@@ -37,6 +36,7 @@
 #include "nsCRT.h"
 #include "nsContentUtils.h"
 #include "nsIMutableArray.h"
+#include "nsIURIMutator.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsIObserverService.h"
 #include "nsIProtocolProxyService.h"
@@ -60,7 +60,6 @@
 #include "LoadInfo.h"
 #include "nsISSLSocketControl.h"
 #include "mozilla/Telemetry.h"
-#include "nsIURL.h"
 #include "nsIConsoleService.h"
 #include "mozilla/BinarySearch.h"
 #include "mozilla/DebugOnly.h"
@@ -71,14 +70,11 @@
 #include "mozilla/Tokenizer.h"
 #include "nsIHttpHeaderVisitor.h"
 #include "nsIMIMEInputStream.h"
-#include "nsIXULRuntime.h"
 #include "nsICacheInfoChannel.h"
 #include "nsIDOMWindowUtils.h"
-#include "nsIURIFixup.h"
 #include "nsHttpChannel.h"
 #include "nsRedirectHistoryEntry.h"
 #include "nsServerTiming.h"
-#include "nsIURIMutator.h"
 #include "mozilla/Tokenizer.h"
 
 #include <algorithm>

netwerk/protocol/http/HttpBaseChannel.h

@@ -26,7 +26,6 @@
 #include "nsIUploadChannel2.h"
 #include "nsIProgressEventSink.h"
 #include "nsIURI.h"
-#include "nsIEffectiveTLDService.h"
 #include "nsIStringEnumerator.h"
 #include "nsISupportsPriority.h"
 #include "nsIClassOfService.h"
@@ -34,7 +33,6 @@
 #include "nsIApplicationCache.h"
 #include "nsIResumableChannel.h"
 #include "nsITraceableChannel.h"
-#include "nsILoadContext.h"
 #include "nsILoadInfo.h"
 #include "mozilla/net/NeckoCommon.h"
 #include "nsThreadUtils.h"

netwerk/protocol/http/HttpChannelChild.cpp

@@ -30,7 +30,6 @@
 #include "CookieServiceChild.h"
 #include "HttpBackgroundChannelChild.h"
 #include "nsCOMPtr.h"
-#include "nsISupportsPrimitives.h"
 #include "nsContentPolicyUtils.h"
 #include "nsDOMNavigationTiming.h"
 #include "nsGlobalWindow.h"
@@ -49,7 +48,6 @@
 #include "SerializedLoadContext.h"
 #include "nsInputStreamPump.h"
 #include "InterceptedChannel.h"
-#include "mozIThirdPartyUtil.h"
 #include "nsContentSecurityManager.h"
 #include "nsICompressConvStats.h"
 #include "nsIDeprecationWarner.h"

netwerk/protocol/http/HttpChannelChild.h

@@ -17,14 +17,12 @@
 #include "mozilla/net/ChannelEventQueue.h"
 
 #include "nsIStreamListener.h"
-#include "nsILoadGroup.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIProgressEventSink.h"
 #include "nsICacheInfoChannel.h"
 #include "nsIApplicationCache.h"
 #include "nsIApplicationCacheChannel.h"
-#include "nsIUploadChannel2.h"
 #include "nsIResumableChannel.h"
 #include "nsIProxiedChannel.h"
 #include "nsIAsyncVerifyRedirectCallback.h"

netwerk/protocol/http/HttpChannelParent.cpp

@@ -34,11 +34,7 @@
 #include "mozilla/ipc/InputStreamUtils.h"
 #include "mozilla/ipc/URIUtils.h"
 #include "SerializedLoadContext.h"
-#include "nsIAuthInformation.h"
-#include "nsIAuthPromptCallback.h"
-#include "nsIContentPolicy.h"
 #include "mozilla/ipc/BackgroundUtils.h"
-#include "nsICachingChannel.h"
 #include "mozilla/LoadInfo.h"
 #include "nsQueryObject.h"
 #include "mozilla/BasePrincipal.h"
@@ -51,10 +47,8 @@
 #include "nsISecureBrowserUI.h"
 #include "nsStreamUtils.h"
 #include "nsStringStream.h"
-#include "nsIStorageStream.h"
 #include "nsThreadUtils.h"
 #include "nsQueryObject.h"
-#include "nsIURIClassifier.h"
 #include "nsIMultiPartChannel.h"
 
 using mozilla::BasePrincipal;

netwerk/protocol/http/HttpChannelParent.h

@@ -14,7 +14,6 @@
 #include "mozilla/net/NeckoCommon.h"
 #include "mozilla/net/NeckoParent.h"
 #include "mozilla/MozPromise.h"
-#include "nsIObserver.h"
 #include "nsIParentRedirectingChannel.h"
 #include "nsIProgressEventSink.h"
 #include "nsIChannelEventSink.h"