Bug 919320 - Minimize the #includes in netwerk/protocol; r=mcmanus

2024-11-25 05:41:12 +00:00 · 2013-09-22 23:35:52 -04:00 · 2013-09-22 23:35:52 -04:00 · 9a3bd8e476
commit 9a3bd8e476
parent 3a4ed11774
96 changed files with 187 additions and 357 deletions
--- a/netwerk/base/src/Dashboard.cpp
+++ b/netwerk/base/src/Dashboard.cpp
@ -15,6 +15,7 @@
 #include "nsIThread.h"
 #include "nsSocketTransportService2.h"
 #include "nsThreadUtils.h"
+#include "nsURLHelper.h"

 using mozilla::AutoSafeJSContext;
 namespace mozilla {
--- a/netwerk/protocol/about/nsAboutBlank.cpp
+++ b/netwerk/protocol/about/nsAboutBlank.cpp
@ -4,8 +4,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsAboutBlank.h"
-#include "nsIIOService.h"
-#include "nsIServiceManager.h"
 #include "nsStringStream.h"
 #include "nsNetUtil.h"

--- a/netwerk/protocol/about/nsAboutBloat.cpp
+++ b/netwerk/protocol/about/nsAboutBloat.cpp
@ -9,13 +9,9 @@
 #ifdef NS_BUILD_REFCNT_LOGGING

 #include "nsAboutBloat.h"
-#include "nsIIOService.h"
-#include "nsIServiceManager.h"
 #include "nsStringStream.h"
-#include "nsXPIDLString.h"
 #include "nsIURI.h"
 #include "nsCOMPtr.h"
-#include "nsIFileStreams.h"
 #include "nsNetUtil.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsIFile.h"
--- a/netwerk/protocol/about/nsAboutCache.cpp
+++ b/netwerk/protocol/about/nsAboutCache.cpp
@ -4,12 +4,8 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsAboutCache.h"
-#include "nsIIOService.h"
-#include "nsIServiceManager.h"
 #include "nsIInputStream.h"
 #include "nsIStorageStream.h"
-#include "nsISimpleEnumerator.h"
-#include "nsXPIDLString.h"
 #include "nsIURI.h"
 #include "nsCOMPtr.h"
 #include "nsNetUtil.h"
--- a/netwerk/protocol/about/nsAboutCacheEntry.cpp
+++ b/netwerk/protocol/about/nsAboutCacheEntry.cpp
@ -3,14 +3,10 @@
 * 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 <limits.h>
-
 #include "nsAboutCacheEntry.h"
 #include "nsICacheService.h"
 #include "nsICacheSession.h"
-#include "nsIStorageStream.h"
 #include "nsNetUtil.h"
-#include "nsAutoPtr.h"
 #include "prprf.h"
 #include "nsEscape.h"
 #include <algorithm>
--- a/netwerk/protocol/about/nsAboutCacheEntry.h
+++ b/netwerk/protocol/about/nsAboutCacheEntry.h
@ -10,12 +10,11 @@
 #include "nsICacheListener.h"
 #include "nsICacheEntryDescriptor.h"
 #include "nsCOMPtr.h"
-#include "nsString.h"

-class nsICacheEntryDescriptor;
 class nsIAsyncOutputStream;
 class nsIInputStream;
 class nsIURI;
+class nsCString;

 class nsAboutCacheEntry : public nsIAboutModule
                        , public nsICacheMetaDataVisitor
--- a/netwerk/protocol/about/nsAboutProtocolHandler.cpp
+++ b/netwerk/protocol/about/nsAboutProtocolHandler.cpp
@ -7,13 +7,8 @@

 #include "nsAboutProtocolHandler.h"
 #include "nsIURI.h"
-#include "nsIIOService.h"
-#include "nsCRT.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
 #include "nsIAboutModule.h"
 #include "nsString.h"
-#include "nsReadableUtils.h"
 #include "nsNetCID.h"
 #include "nsAboutProtocolUtils.h"
 #include "nsError.h"
--- a/netwerk/protocol/about/nsAboutProtocolHandler.h
+++ b/netwerk/protocol/about/nsAboutProtocolHandler.h
@ -10,8 +10,6 @@
 #include "nsSimpleNestedURI.h"
 #include "mozilla/Attributes.h"

-class nsCString;
-class nsIAboutModule;
 class nsIURI;

 class nsAboutProtocolHandler : public nsIProtocolHandler
--- a/netwerk/protocol/about/nsAboutProtocolUtils.h
+++ b/netwerk/protocol/about/nsAboutProtocolUtils.h
@ -6,6 +6,7 @@
 #include "nsString.h"
 #include "nsReadableUtils.h"
 #include "nsIAboutModule.h"
+#include "nsServiceManagerUtils.h"

 inline nsresult
 NS_GetAboutModuleName(nsIURI *aAboutURI, nsCString& aModule)
--- a/netwerk/protocol/data/nsDataChannel.cpp
+++ b/netwerk/protocol/data/nsDataChannel.cpp
@ -10,11 +10,9 @@
 #include "mozilla/Base64.h"
 #include "nsIOService.h"
 #include "nsDataHandler.h"
-#include "nsNetUtil.h"
 #include "nsIPipe.h"
 #include "nsIInputStream.h"
 #include "nsIOutputStream.h"
-#include "nsReadableUtils.h"
 #include "nsEscape.h"

 using namespace mozilla;
--- a/netwerk/protocol/data/nsDataChannel.h
+++ b/netwerk/protocol/data/nsDataChannel.h
@ -9,8 +9,8 @@
 #define nsDataChannel_h___

 #include "nsBaseChannel.h"
-#include "nsIInputStream.h"
-#include "nsCOMPtr.h"
+
+class nsIInputStream;

 class nsDataChannel : public nsBaseChannel {
 public:
--- a/netwerk/protocol/data/nsDataHandler.cpp
+++ b/netwerk/protocol/data/nsDataHandler.cpp
@ -3,16 +3,8 @@
 * 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 "nspr.h"
 #include "nsDataChannel.h"
 #include "nsDataHandler.h"
-#include "nsIURL.h"
-#include "nsCRT.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsIProgressEventSink.h"
 #include "nsNetCID.h"
 #include "nsError.h"

--- a/netwerk/protocol/device/nsDeviceChannel.cpp
+++ b/netwerk/protocol/device/nsDeviceChannel.cpp
@ -4,12 +4,11 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "plstr.h"
-#include "nsComponentManagerUtils.h"
 #include "nsDeviceChannel.h"
 #include "nsDeviceCaptureProvider.h"
-#include "mozilla/Preferences.h"

 #ifdef MOZ_WIDGET_ANDROID
+#include "mozilla/Preferences.h"
 #include "AndroidCaptureProvider.h"
 #endif

--- a/netwerk/protocol/device/nsDeviceProtocolHandler.cpp
+++ b/netwerk/protocol/device/nsDeviceProtocolHandler.cpp
@ -5,9 +5,7 @@

 #include "nsDeviceProtocolHandler.h"
 #include "nsDeviceChannel.h"
-#include "nsNetCID.h"
 #include "nsAutoPtr.h"
-#include "nsCOMPtr.h"
 #include "nsSimpleURI.h"

 //-----------------------------------------------------------------------------
--- a/netwerk/protocol/device/nsDeviceProtocolHandler.h
+++ b/netwerk/protocol/device/nsDeviceProtocolHandler.h
@ -7,7 +7,6 @@
 #define nsDeviceProtocolHandler_h_

 #include "nsIProtocolHandler.h"
-#include "nsString.h"
 #include "mozilla/Attributes.h"

 // {6b0ffe9e-d114-486b-aeb7-da62e7273ed5}
--- a/netwerk/protocol/file/nsFileChannel.cpp
+++ b/netwerk/protocol/file/nsFileChannel.cpp
@ -11,12 +11,10 @@
 #include "nsThreadUtils.h"
 #include "nsTransportUtils.h"
 #include "nsStreamUtils.h"
-#include "nsURLHelper.h"
 #include "nsMimeTypes.h"
 #include "nsNetUtil.h"
 #include "nsProxyRelease.h"
 #include "nsAutoPtr.h"
-#include "nsStandardURL.h"

 #include "nsIFileURL.h"
 #include "nsIMIMEService.h"
--- a/netwerk/protocol/file/nsFileProtocolHandler.cpp
+++ b/netwerk/protocol/file/nsFileProtocolHandler.cpp
@ -6,13 +6,8 @@

 #include "nsFileProtocolHandler.h"
 #include "nsFileChannel.h"
-#include "nsInputStreamChannel.h"
 #include "nsStandardURL.h"
 #include "nsURLHelper.h"
-#include "nsNetCID.h"
-
-#include "nsIServiceManager.h"
-#include "nsIURL.h"

 #include "nsNetUtil.h"

--- a/netwerk/protocol/ftp/FTPChannelChild.cpp
+++ b/netwerk/protocol/ftp/FTPChannelChild.cpp
@ -11,11 +11,7 @@
 #include "nsFtpProtocolHandler.h"
 #include "nsITabChild.h"
 #include "nsStringStream.h"
-#include "nsMimeTypes.h"
 #include "nsNetUtil.h"
-#include "nsIURIFixup.h"
-#include "nsILoadContext.h"
-#include "nsCDefaultURIFixup.h"
 #include "base/compiler_specific.h"
 #include "mozilla/ipc/InputStreamUtils.h"
 #include "mozilla/ipc/URIUtils.h"
--- a/netwerk/protocol/ftp/FTPChannelParent.cpp
+++ b/netwerk/protocol/ftp/FTPChannelParent.cpp
@ -8,10 +8,7 @@
 #include "mozilla/net/FTPChannelParent.h"
 #include "nsFTPChannel.h"
 #include "nsNetUtil.h"
-#include "nsISupportsPriority.h"
-#include "nsIRedirectChannelRegistrar.h"
 #include "nsFtpProtocolHandler.h"
-#include "mozilla/LoadContext.h"
 #include "mozilla/ipc/InputStreamUtils.h"
 #include "mozilla/ipc/URIUtils.h"

--- a/netwerk/protocol/ftp/FTPChannelParent.h
+++ b/netwerk/protocol/ftp/FTPChannelParent.h
@ -9,13 +9,12 @@
 #define mozilla_net_FTPChannelParent_h

 #include "mozilla/net/PFTPChannelParent.h"
-#include "mozilla/net/NeckoCommon.h"
 #include "mozilla/net/NeckoParent.h"
 #include "nsIParentChannel.h"
 #include "nsIInterfaceRequestor.h"
-#include "nsILoadContext.h"

 class nsFtpChannel;
+class nsILoadContext;

 namespace mozilla {
 namespace net {
--- a/netwerk/protocol/ftp/nsFTPChannel.cpp
+++ b/netwerk/protocol/ftp/nsFTPChannel.cpp
@ -7,17 +7,7 @@
 #include "nsFTPChannel.h"
 #include "nsFtpConnectionThread.h"  // defines nsFtpState

-#include "nsIStreamListener.h"
-#include "nsIServiceManager.h"
 #include "nsThreadUtils.h"
-#include "nsNetUtil.h"
-#include "nsMimeTypes.h"
-#include "nsReadableUtils.h"
-#include "nsIPrefService.h"
-#include "nsIPrefBranch.h"
-#include "nsIStreamConverterService.h"
-#include "nsISocketTransport.h"
-#include "nsURLHelper.h"
 #include "mozilla/Attributes.h"

 #if defined(PR_LOGGING)
--- a/netwerk/protocol/ftp/nsFTPChannel.h
+++ b/netwerk/protocol/ftp/nsFTPChannel.h
@ -9,27 +9,15 @@

 #include "nsBaseChannel.h"

-#include "nsIIOService.h"
-#include "nsIURI.h"
 #include "nsString.h"
-#include "nsILoadGroup.h"
 #include "nsCOMPtr.h"
-#include "nsIProtocolHandler.h"
-#include "nsIProgressEventSink.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsFtpConnectionThread.h"
-#include "netCore.h"
-#include "nsIStreamListener.h"
 #include "nsIFTPChannel.h"
 #include "nsIUploadChannel.h"
 #include "nsIProxyInfo.h"
 #include "nsIProxiedChannel.h"
 #include "nsIResumableChannel.h"
-#include "nsHashPropertyBag.h"
-#include "nsFtpProtocolHandler.h"
-#include "nsNetUtil.h"
-#include "PrivateBrowsingChannel.h"
+
+class nsIURI;

 class nsFtpChannel : public nsBaseChannel,
                     public nsIFTPChannel,
--- a/netwerk/protocol/ftp/nsFtpConnectionThread.cpp
+++ b/netwerk/protocol/ftp/nsFtpConnectionThread.cpp
@ -4,7 +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 <limits.h>
 #include <ctype.h>

 #include "prprf.h"
@ -16,7 +15,6 @@
 #include "nsFtpConnectionThread.h"
 #include "nsFtpControlConnection.h"
 #include "nsFtpProtocolHandler.h"
-#include "ftpCore.h"
 #include "netCore.h"
 #include "nsCRT.h"
 #include "nsEscape.h"
@ -35,6 +33,15 @@
 #include "nsICharsetConverterManager.h"
 #include "nsIProtocolProxyService.h"
 #include "nsICancelable.h"
+#include "nsICacheEntryDescriptor.h"
+#include "nsIOutputStream.h"
+#include "nsIPrompt.h"
+#include "nsIProtocolHandler.h"
+#include "nsIProxyInfo.h"
+#include "nsIRunnable.h"
+#include "nsISocketTransportService.h"
+#include "nsIURI.h"
+#include "nsICacheSession.h"

 #if defined(PR_LOGGING)
 extern PRLogModuleInfo* gFTPLog;
--- a/netwerk/protocol/ftp/nsFtpConnectionThread.h
+++ b/netwerk/protocol/ftp/nsFtpConnectionThread.h
@ -6,36 +6,16 @@
 #ifndef __nsFtpState__h_
 #define __nsFtpState__h_

-#include "ftpCore.h"
-#include "nsFTPChannel.h"
 #include "nsBaseContentStream.h"

-#include "nsIThread.h"
-#include "nsIRunnable.h"
-#include "nsISocketTransportService.h"
-#include "nsISocketTransport.h"
-#include "nsIServiceManager.h"
-#include "nsIStreamListener.h"
 #include "nsICacheListener.h"
-#include "nsIURI.h"
-#include "prnetdb.h"
-#include "prtime.h"
 #include "nsString.h"
-#include "nsIFTPChannel.h"
-#include "nsIProtocolHandler.h"
 #include "nsCOMPtr.h"
 #include "nsIAsyncInputStream.h"
-#include "nsIOutputStream.h"
 #include "nsAutoPtr.h"
-#include "nsIPrompt.h"
 #include "nsITransport.h"
-#include "nsIProxyInfo.h"
 #include "mozilla/net/DNS.h"
-
 #include "nsFtpControlConnection.h"
-
-#include "nsICacheEntryDescriptor.h"
-#include "nsICacheListener.h"
 #include "nsIProtocolProxyCallback.h"

 // ftp server types
@ -80,6 +60,9 @@ typedef enum _FTP_ACTION {GET, PUT} FTP_ACTION;

 class nsFtpChannel;
 class nsICancelable;
+class nsICacheEntryDescriptor;
+class nsIProxyInfo;
+class nsIStreamListener;

 // The nsFtpState object is the content stream for the channel.  It implements
 // nsIInputStreamCallback, so it can read data from the control connection.  It
--- a/netwerk/protocol/ftp/nsFtpControlConnection.cpp
+++ b/netwerk/protocol/ftp/nsFtpControlConnection.cpp
@ -4,17 +4,15 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsIOService.h"
-#include "nsFTPChannel.h"
 #include "nsFtpControlConnection.h"
 #include "nsFtpProtocolHandler.h"
 #include "prlog.h"
-#include "nsIPipe.h"
 #include "nsIInputStream.h"
 #include "nsISocketTransportService.h"
 #include "nsISocketTransport.h"
-#include "nsNetUtil.h"
 #include "nsThreadUtils.h"
-#include "nsCRT.h"
+#include "nsIOutputStream.h"
+#include "nsNetCID.h"
 #include <algorithm>

 #if defined(PR_LOGGING)
--- a/netwerk/protocol/ftp/nsFtpControlConnection.h
+++ b/netwerk/protocol/ftp/nsFtpControlConnection.h
@ -9,16 +9,13 @@

 #include "nsCOMPtr.h"

-#include "nsIURI.h"
-#include "nsIStreamListener.h"
-#include "nsIRequest.h"
 #include "nsISocketTransport.h"
-#include "nsIOutputStream.h"
 #include "nsIAsyncInputStream.h"
 #include "nsAutoPtr.h"
 #include "nsString.h"
 #include "mozilla/Attributes.h"

+class nsIOutputStream;
 class nsIProxyInfo;
 class nsITransportEventSink;

--- a/netwerk/protocol/ftp/nsFtpProtocolHandler.cpp
+++ b/netwerk/protocol/ftp/nsFtpProtocolHandler.cpp
@ -24,20 +24,14 @@ using namespace mozilla::net;

 #include "nsFtpProtocolHandler.h"
 #include "nsFTPChannel.h"
-#include "nsIURL.h"
 #include "nsIStandardURL.h"
-#include "nsCRT.h"
-#include "nsIComponentManager.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsIProgressEventSink.h"
 #include "prlog.h"
-#include "nsNetUtil.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsIObserverService.h"
 #include "nsEscape.h"
 #include "nsAlgorithm.h"
+#include "nsICacheSession.h"

 //-----------------------------------------------------------------------------

--- a/netwerk/protocol/ftp/nsFtpProtocolHandler.h
+++ b/netwerk/protocol/ftp/nsFtpProtocolHandler.h
@ -7,19 +7,13 @@
 #define nsFtpProtocolHandler_h__

 #include "nsFtpControlConnection.h"
-#include "nsIServiceManager.h"
 #include "nsIProxiedProtocolHandler.h"
 #include "nsTArray.h"
-#include "nsIIOService.h"
 #include "nsITimer.h"
-#include "nsIObserverService.h"
-#include "nsICacheSession.h"
 #include "nsIObserver.h"
 #include "nsWeakReference.h"
-#include "nsCRT.h"

-class nsITimer;
-class nsIStreamListener;
+class nsICacheSession;

 //-----------------------------------------------------------------------------

--- a/netwerk/protocol/http/ASpdySession.h
+++ b/netwerk/protocol/http/ASpdySession.h
@ -8,7 +8,6 @@
 #define mozilla_net_ASpdySession_h

 #include "nsAHttpTransaction.h"
-#include "nsAHttpConnection.h"
 #include "prinrval.h"
 #include "nsString.h"

--- a/netwerk/protocol/http/ConnectionDiagnostics.cpp
+++ b/netwerk/protocol/http/ConnectionDiagnostics.cpp
@ -13,6 +13,7 @@
 #include "SpdySession3.h"
 #include "nsHttpHandler.h"
 #include "nsIConsoleService.h"
+#include "nsHttpRequestHead.h"

 using namespace mozilla;
 using namespace mozilla::net;
--- a/netwerk/protocol/http/HttpBaseChannel.cpp
+++ b/netwerk/protocol/http/HttpBaseChannel.cpp
@ -18,14 +18,15 @@
 #include "nsISeekableStream.h"
 #include "nsITimedChannel.h"
 #include "nsIEncodedChannel.h"
-#include "nsIResumableChannel.h"
 #include "nsIApplicationCacheChannel.h"
-#include "nsILoadContext.h"
 #include "nsEscape.h"
 #include "nsStreamListenerWrapper.h"
 #include "nsISecurityConsoleMessage.h"
+#include "nsURLHelper.h"
+#include "nsICookieService.h"
+#include "nsIStreamConverterService.h"
+#include "nsCRT.h"

-#include "prnetdb.h"
 #include <algorithm>

 namespace mozilla {
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@ -15,7 +15,6 @@

 #include "nsStringStream.h"
 #include "nsHttpHandler.h"
-#include "nsMimeTypes.h"
 #include "nsNetUtil.h"
 #include "nsSerializationHelper.h"
 #include "mozilla/Attributes.h"
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@ -20,10 +20,6 @@
 #include "nsISerializable.h"
 #include "nsIAssociatedContentSecurity.h"
 #include "nsIApplicationCacheService.h"
-#include "nsIOfflineCacheUpdate.h"
-#include "nsIRedirectChannelRegistrar.h"
-#include "mozilla/LoadContext.h"
-#include "prinit.h"
 #include "mozilla/ipc/InputStreamUtils.h"
 #include "mozilla/ipc/URIUtils.h"

--- a/netwerk/protocol/http/HttpChannelParentListener.cpp
+++ b/netwerk/protocol/http/HttpChannelParentListener.cpp
@ -9,21 +9,9 @@

 #include "HttpChannelParentListener.h"
 #include "mozilla/net/HttpChannelParent.h"
-#include "mozilla/dom/TabParent.h"
-#include "mozilla/net/NeckoParent.h"
 #include "mozilla/unused.h"
-#include "nsHttpChannel.h"
-#include "nsHttpHandler.h"
-#include "nsNetUtil.h"
-#include "nsISupportsPriority.h"
-#include "nsIAuthPromptProvider.h"
-#include "nsSerializationHelper.h"
-#include "nsISerializable.h"
-#include "nsIAssociatedContentSecurity.h"
-#include "nsISecureBrowserUI.h"
 #include "nsIRedirectChannelRegistrar.h"
-
-#include "nsIFTPChannel.h"
+#include "nsIHttpEventSink.h"

 using mozilla::unused;

--- a/netwerk/protocol/http/HttpChannelParentListener.h
+++ b/netwerk/protocol/http/HttpChannelParentListener.h
@ -8,16 +8,11 @@
 #ifndef mozilla_net_HttpChannelCallbackWrapper_h
 #define mozilla_net_HttpChannelCallbackWrapper_h

-#include "nsHttp.h"
-#include "mozilla/net/NeckoCommon.h"
-#include "PHttpChannelParams.h"
-#include "nsIParentChannel.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIChannelEventSink.h"
 #include "nsIRedirectResultListener.h"
-#include "nsIProgressEventSink.h"

-class nsICacheEntryDescriptor;
+class nsIParentChannel;

 namespace mozilla {
 namespace net {
--- a/netwerk/protocol/http/HttpInfo.h
+++ b/netwerk/protocol/http/HttpInfo.h
@ -2,14 +2,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 "mozilla/net/DashboardTypes.h"
-
 #ifndef nsHttpInfo__
 #define nsHttpInfo__

+template<class T> class nsTArray;
+
 namespace mozilla {
 namespace net {

+struct HttpRetParams;
+
 class HttpInfo
 {
 public:
--- a/netwerk/protocol/http/NullHttpTransaction.cpp
+++ b/netwerk/protocol/http/NullHttpTransaction.cpp
@ -9,8 +9,8 @@

 #include "nsHttp.h"
 #include "NullHttpTransaction.h"
-#include "nsProxyRelease.h"
 #include "nsHttpHandler.h"
+#include "nsHttpRequestHead.h"

 namespace mozilla {
 namespace net {
--- a/netwerk/protocol/http/NullHttpTransaction.h
+++ b/netwerk/protocol/http/NullHttpTransaction.h
@ -8,12 +8,12 @@
 #define mozilla_net_NullHttpTransaction_h

 #include "nsAHttpTransaction.h"
-#include "nsAHttpConnection.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsHttpConnectionInfo.h"
-#include "nsHttpRequestHead.h"
 #include "mozilla/Attributes.h"

+class nsAHttpConnection;
+class nsHttpRequestHead;
+class nsHttpConnectionInfo;
+
 // This is the minimal nsAHttpTransaction implementation. A NullHttpTransaction
 // can be used to drive connection level semantics (such as SSL handshakes
 // tunnels) so that a nsHttpConnection becomes fully established in
--- a/netwerk/protocol/http/SpdyPush3.cpp
+++ b/netwerk/protocol/http/SpdyPush3.cpp
@ -9,8 +9,10 @@

 #include <algorithm>

-#include "nsDependentString.h"
 #include "SpdyPush3.h"
+#include "PSpdyPush3.h"
+#include "SpdySession3.h"
+#include "nsHttpRequestHead.h"

 namespace mozilla {
 namespace net {
--- a/netwerk/protocol/http/SpdyPush3.h
+++ b/netwerk/protocol/http/SpdyPush3.h
@ -11,16 +11,15 @@

 #include "mozilla/Attributes.h"
 #include "mozilla/TimeStamp.h"
-#include "nsHttpRequestHead.h"
 #include "nsILoadGroup.h"
 #include "nsString.h"
-#include "PSpdyPush3.h"
-#include "SpdySession3.h"
 #include "SpdyStream3.h"

 namespace mozilla {
 namespace net {

+class SpdySession3;
+
 class SpdyPush3TransactionBuffer;

 class SpdyPushedStream3 MOZ_FINAL : public SpdyStream3
--- a/netwerk/protocol/http/SpdySession2.cpp
+++ b/netwerk/protocol/http/SpdySession2.cpp
@ -10,11 +10,9 @@
 #include "nsHttp.h"
 #include "SpdySession2.h"
 #include "SpdyStream2.h"
-#include "nsHttpConnection.h"
 #include "nsHttpHandler.h"
 #include "prnetdb.h"
 #include "mozilla/Telemetry.h"
-#include "mozilla/Preferences.h"
 #include "prprf.h"
 #include <algorithm>

--- a/netwerk/protocol/http/SpdySession2.h
+++ b/netwerk/protocol/http/SpdySession2.h
@ -11,6 +11,7 @@
 // http://www.chromium.org/spdy/spdy-protocol/spdy-protocol-draft2

 #include "ASpdySession.h"
+#include "nsAHttpConnection.h"
 #include "nsClassHashtable.h"
 #include "nsDataHashtable.h"
 #include "nsDeque.h"
@ -18,7 +19,6 @@
 #include "zlib.h"
 #include "mozilla/Attributes.h"

-class nsHttpConnection;
 class nsISocketTransport;

 namespace mozilla { namespace net {
--- a/netwerk/protocol/http/SpdySession3.cpp
+++ b/netwerk/protocol/http/SpdySession3.cpp
@ -8,16 +8,15 @@
 #include "HttpLog.h"

 #include "mozilla/Telemetry.h"
-#include "mozilla/Preferences.h"
 #include "nsHttp.h"
 #include "nsHttpHandler.h"
-#include "nsHttpConnection.h"
 #include "nsILoadGroup.h"
 #include "prprf.h"
 #include "prnetdb.h"
 #include "SpdyPush3.h"
 #include "SpdySession3.h"
 #include "SpdyStream3.h"
+#include "PSpdyPush3.h"

 #include <algorithm>

--- a/netwerk/protocol/http/SpdySession3.h
+++ b/netwerk/protocol/http/SpdySession3.h
@ -11,6 +11,7 @@

 #include "ASpdySession.h"
 #include "mozilla/Attributes.h"
+#include "nsAHttpConnection.h"
 #include "nsClassHashtable.h"
 #include "nsDataHashtable.h"
 #include "nsDeque.h"
--- a/netwerk/protocol/http/SpdyStream2.cpp
+++ b/netwerk/protocol/http/SpdyStream2.cpp
@ -10,7 +10,6 @@
 #include "nsHttp.h"
 #include "SpdySession2.h"
 #include "SpdyStream2.h"
-#include "nsAlgorithm.h"
 #include "prnetdb.h"
 #include "nsHttpRequestHead.h"
 #include "mozilla/Telemetry.h"
--- a/netwerk/protocol/http/SpdyStream3.cpp
+++ b/netwerk/protocol/http/SpdyStream3.cpp
@ -8,7 +8,6 @@
 #include "HttpLog.h"

 #include "mozilla/Telemetry.h"
-#include "nsAlgorithm.h"
 #include "nsHttp.h"
 #include "nsHttpHandler.h"
 #include "nsHttpRequestHead.h"
@ -18,6 +17,7 @@
 #include "SpdyPush3.h"
 #include "SpdySession3.h"
 #include "SpdyStream3.h"
+#include "PSpdyPush3.h"

 #include <algorithm>

--- a/netwerk/protocol/http/SpdyStream3.h
+++ b/netwerk/protocol/http/SpdyStream3.h
@ -6,11 +6,16 @@
 #ifndef mozilla_net_SpdyStream3_h
 #define mozilla_net_SpdyStream3_h

-#include "mozilla/Attributes.h"
 #include "nsAHttpTransaction.h"
+#include "zlib.h"
+
+class nsISocketTransport;

 namespace mozilla { namespace net {

+class SpdySession3;
+class SpdyPushedStream3;
+
 class SpdyStream3 : public nsAHttpSegmentReader
                  , public nsAHttpSegmentWriter
 {
--- a/netwerk/protocol/http/nsHttp.cpp
+++ b/netwerk/protocol/http/nsHttp.cpp
@ -12,7 +12,6 @@
 #include "mozilla/Mutex.h"
 #include "mozilla/HashFunctions.h"
 #include "nsCRT.h"
-#include "prbit.h"

 using namespace mozilla;

--- a/netwerk/protocol/http/nsHttp.h
+++ b/netwerk/protocol/http/nsHttp.h
@ -7,13 +7,10 @@
 #ifndef nsHttp_h__
 #define nsHttp_h__

-#include "plstr.h"
+#include <stdint.h>
 #include "prtime.h"
-#include "nsISupportsUtils.h"
-#include "nsPromiseFlatString.h"
-#include "nsURLHelper.h"
-#include "netCore.h"
-#include "mozilla/Mutex.h"
+#include "nsString.h"
+#include "nsError.h"

 // http version codes
 #define NS_HTTP_VERSION_UNKNOWN  0
@ -22,6 +19,9 @@
 #define NS_HTTP_VERSION_1_1     11

 namespace mozilla {
+
+class Mutex;
+
 namespace net {
    enum {
        SPDY_VERSION_2 = 2,
--- a/netwerk/protocol/http/nsHttpActivityDistributor.cpp
+++ b/netwerk/protocol/http/nsHttpActivityDistributor.cpp
@ -6,10 +6,8 @@
 #include "HttpLog.h"

 #include "nsHttpActivityDistributor.h"
-#include "nsIChannel.h"
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"
-#include "nsNetUtil.h"
 #include "nsThreadUtils.h"

 using namespace mozilla;
--- a/netwerk/protocol/http/nsHttpAuthCache.cpp
+++ b/netwerk/protocol/http/nsHttpAuthCache.cpp
@ -11,10 +11,8 @@
 #include <stdlib.h>

 #include "mozilla/Attributes.h"
-#include "nsHttp.h"
 #include "nsString.h"
 #include "nsCRT.h"
-#include "prprf.h"
 #include "mozIApplicationClearPrivateDataParams.h"
 #include "nsIObserverService.h"
 #include "mozilla/Services.h"
--- a/netwerk/protocol/http/nsHttpAuthCache.h
+++ b/netwerk/protocol/http/nsHttpAuthCache.h
@ -6,17 +6,15 @@
 #ifndef nsHttpAuthCache_h__
 #define nsHttpAuthCache_h__

-#include "nsHttp.h"
 #include "nsError.h"
 #include "nsTArray.h"
 #include "nsAutoPtr.h"
-#include "nsAString.h"
-#include "nsString.h"
 #include "nsCOMPtr.h"
 #include "plhash.h"
-#include "nsCRT.h"
 #include "nsIObserver.h"

+class nsCString;
+
 struct nsHttpAuthPath {
    struct nsHttpAuthPath *mNext;
    char                   mPath[1];
--- a/netwerk/protocol/http/nsHttpAuthManager.cpp
+++ b/netwerk/protocol/http/nsHttpAuthManager.cpp
@ -7,9 +7,7 @@
 #include "HttpLog.h"

 #include "nsHttpHandler.h"
-#include "nsHttpChannel.h"
 #include "nsHttpAuthManager.h"
-#include "nsReadableUtils.h"
 #include "nsNetUtil.h"
 #include "nsIPrincipal.h"

--- a/netwerk/protocol/http/nsHttpAuthManager.h
+++ b/netwerk/protocol/http/nsHttpAuthManager.h
@ -6,9 +6,10 @@
 #ifndef nsHttpAuthManager_h__
 #define nsHttpAuthManager_h__

-#include "nsHttpAuthCache.h"
 #include "nsIHttpAuthManager.h"

+class nsHttpAuthCache;
+
 class nsHttpAuthManager : public nsIHttpAuthManager
 {
 public:
--- a/netwerk/protocol/http/nsHttpBasicAuth.cpp
+++ b/netwerk/protocol/http/nsHttpBasicAuth.cpp
@ -6,7 +6,6 @@
 // HttpLog.h should generally be included first
 #include "HttpLog.h"

-#include "nsHttp.h"
 #include "nsHttpBasicAuth.h"
 #include "plbase64.h"
 #include "nsString.h"
--- a/netwerk/protocol/http/nsHttpBasicAuth.h
+++ b/netwerk/protocol/http/nsHttpBasicAuth.h
@ -8,8 +8,6 @@

 #include "nsIHttpAuthenticator.h"

-class nsIURI;
-
 //-----------------------------------------------------------------------------
 // The nsHttpBasicAuth class produces HTTP Basic-auth responses for a username/
 // (optional)password pair, BASE64("user:pass").
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@ -10,13 +10,11 @@
 #include "nsHttp.h"
 #include "nsHttpChannel.h"
 #include "nsHttpHandler.h"
-#include "nsStandardURL.h"
 #include "nsIApplicationCacheService.h"
 #include "nsIApplicationCacheContainer.h"
 #include "nsICacheStorageService.h"
 #include "nsICacheStorage.h"
 #include "nsICacheEntry.h"
-#include "nsIAuthInformation.h"
 #include "nsICryptoHash.h"
 #include "nsIStringBundle.h"
 #include "nsIStreamListenerTee.h"
@ -39,7 +37,6 @@
 #include "nsAlgorithm.h"
 #include "GeckoProfiler.h"
 #include "nsIConsoleService.h"
-#include "NullHttpTransaction.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/VisualEventTracer.h"
 #include "nsISSLSocketControl.h"
@ -47,12 +44,24 @@
 #include "nsContentUtils.h"
 #include "nsIPermissionManager.h"
 #include "nsIPrincipal.h"
-#include "nsISecurityConsoleMessage.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsISSLStatus.h"
 #include "nsISSLStatusProvider.h"
-#include "nsIDOMWindow.h"
 #include "LoadContextInfo.h"
+#include "netCore.h"
+#include "nsHttpTransaction.h"
+#include "nsICacheEntryDescriptor.h"
+#include "nsICancelable.h"
+#include "nsIHttpChannelAuthProvider.h"
+#include "nsIHttpEventSink.h"
+#include "nsIPrompt.h"
+#include "nsInputStreamPump.h"
+#include "nsURLHelper.h"
+#include "nsISocketTransport.h"
+#include "nsICacheSession.h"
+#include "nsIStreamConverterService.h"
+#include "nsISiteSecurityService.h"
+#include "nsCRT.h"

 namespace mozilla { namespace net {

--- a/netwerk/protocol/http/nsHttpChannel.h
+++ b/netwerk/protocol/http/nsHttpChannel.h
@ -8,34 +8,29 @@
 #define nsHttpChannel_h__

 #include "HttpBaseChannel.h"
-
-#include "nsHttpTransaction.h"
-#include "nsInputStreamPump.h"
 #include "nsTArray.h"
-
-#include "nsIHttpEventSink.h"
 #include "nsICachingChannel.h"
 #include "nsICacheEntry.h"
 #include "nsICacheEntryOpenCallback.h"
 #include "nsIApplicationCacheChannel.h"
-#include "nsIPrompt.h"
-#include "nsIResumableChannel.h"
 #include "nsIProtocolProxyCallback.h"
-#include "nsICancelable.h"
 #include "nsIHttpAuthenticableChannel.h"
-#include "nsIHttpChannelAuthProvider.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
 #include "nsITimedChannel.h"
-#include "nsIFile.h"
 #include "nsIThreadRetargetableRequest.h"
 #include "nsIThreadRetargetableStreamListener.h"
-#include "nsDNSPrefetch.h"
 #include "TimingStruct.h"
 #include "AutoClose.h"
 #include "mozilla/Telemetry.h"

 class nsAHttpConnection;
 class nsIPrincipal;
+class nsDNSPrefetch;
+class nsHttpTransaction;
+class nsICacheEntryDescriptor;
+class nsICancelable;
+class nsIHttpChannelAuthProvider;
+class nsInputStreamPump;

 namespace mozilla { namespace net {

--- a/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
+++ b/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
@ -19,7 +19,9 @@
 #include "nsAuthInformationHolder.h"
 #include "nsIStringBundle.h"
 #include "nsIPrompt.h"
-#include "nsNetUtil.h"
+#include "netCore.h"
+#include "nsIHttpAuthenticableChannel.h"
+#include "nsIURI.h"

 static void
 GetAppIdAndBrowserStatus(nsIChannel* aChan, uint32_t* aAppId, bool* aInBrowserElem)
--- a/netwerk/protocol/http/nsHttpChannelAuthProvider.h
+++ b/netwerk/protocol/http/nsHttpChannelAuthProvider.h
@ -7,19 +7,18 @@
 #ifndef nsHttpChannelAuthProvider_h__
 #define nsHttpChannelAuthProvider_h__

-#include "nsHttp.h"
 #include "nsIHttpChannelAuthProvider.h"
 #include "nsIAuthPromptCallback.h"
 #include "nsString.h"
 #include "nsCOMPtr.h"
-#include "nsIHttpAuthenticableChannel.h"
-#include "nsIURI.h"
 #include "nsHttpAuthCache.h"
 #include "nsProxyInfo.h"
-#include "mozilla/Attributes.h"
+#include "nsCRT.h"

+class nsIHttpAuthenticableChannel;
 class nsIHttpAuthenticator;
 class nsHttpHandler;
+class nsIURI;

 class nsHttpChannelAuthProvider : public nsIHttpChannelAuthProvider
                                , public nsIAuthPromptCallback
--- a/netwerk/protocol/http/nsHttpChunkedDecoder.cpp
+++ b/netwerk/protocol/http/nsHttpChunkedDecoder.cpp
@ -7,7 +7,6 @@
 #include "HttpLog.h"

 #include "nsHttpChunkedDecoder.h"
-#include "nsHttp.h"
 #include <algorithm>

 //-----------------------------------------------------------------------------
--- a/netwerk/protocol/http/nsHttpChunkedDecoder.h
+++ b/netwerk/protocol/http/nsHttpChunkedDecoder.h
@ -6,7 +6,6 @@
 #ifndef nsHttpChunkedDecoder_h__
 #define nsHttpChunkedDecoder_h__

-#include "nsHttp.h"
 #include "nsError.h"
 #include "nsString.h"
 #include "nsHttpHeaderArray.h"
--- a/netwerk/protocol/http/nsHttpConnection.cpp
+++ b/netwerk/protocol/http/nsHttpConnection.cpp
@ -8,19 +8,14 @@
 #include "HttpLog.h"

 #include "nsHttpConnection.h"
-#include "nsHttpTransaction.h"
 #include "nsHttpRequestHead.h"
 #include "nsHttpResponseHead.h"
 #include "nsHttpHandler.h"
 #include "nsIOService.h"
-#include "nsISocketTransportService.h"
 #include "nsISocketTransport.h"
-#include "nsIServiceManager.h"
 #include "nsISSLSocketControl.h"
 #include "sslt.h"
 #include "nsStringStream.h"
-#include "netCore.h"
-#include "nsNetCID.h"
 #include "nsProxyRelease.h"
 #include "nsPreloadedStream.h"
 #include "ASpdySession.h"
--- a/netwerk/protocol/http/nsHttpConnection.h
+++ b/netwerk/protocol/http/nsHttpConnection.h
@ -6,18 +6,13 @@
 #ifndef nsHttpConnection_h__
 #define nsHttpConnection_h__

-#include "nsHttp.h"
 #include "nsHttpConnectionInfo.h"
 #include "nsAHttpTransaction.h"
-#include "nsXPIDLString.h"
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"
 #include "nsProxyRelease.h"
 #include "prinrval.h"
-#include "ASpdySession.h"

-#include "nsIStreamListener.h"
-#include "nsISocketTransport.h"
 #include "nsIAsyncInputStream.h"
 #include "nsIAsyncOutputStream.h"
 #include "nsIInterfaceRequestor.h"
@ -25,6 +20,13 @@
 class nsHttpRequestHead;
 class nsHttpResponseHead;
 class nsHttpHandler;
+class nsISocketTransport;
+
+namespace mozilla {
+namespace net {
+class ASpdySession;
+}
+}

 //-----------------------------------------------------------------------------
 // nsHttpConnection - represents a connection to a HTTP server (or proxy)
--- a/netwerk/protocol/http/nsHttpConnectionInfo.h
+++ b/netwerk/protocol/http/nsHttpConnectionInfo.h
@ -10,11 +10,7 @@
 #include "nsHttp.h"
 #include "nsProxyInfo.h"
 #include "nsCOMPtr.h"
-#include "nsDependentString.h"
-#include "nsString.h"
-#include "plstr.h"
-#include "nsCRT.h"
-#include "nsIProtocolProxyService.h"
+#include "nsStringFwd.h"

 extern PRLogModuleInfo *gHttpLog;

--- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
@ -15,15 +15,13 @@
 #include "nsCOMPtr.h"
 #include "nsNetUtil.h"
 #include "mozilla/net/DNS.h"
-
-#include "nsIServiceManager.h"
-
-#include "nsIObserverService.h"
-
+#include "nsISocketTransport.h"
 #include "nsISSLSocketControl.h"
-#include "prnetdb.h"
 #include "mozilla/Telemetry.h"
-#include "mozilla/VisualEventTracer.h"
+#include "mozilla/net/DashboardTypes.h"
+#include "NullHttpTransaction.h"
+#include "nsITransport.h"
+#include "nsISocketTransportService.h"
 #include <algorithm>

 using namespace mozilla;
--- a/netwerk/protocol/http/nsHttpConnectionMgr.h
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.h
@ -6,24 +6,19 @@
 #ifndef nsHttpConnectionMgr_h__
 #define nsHttpConnectionMgr_h__

-#include "nsHttpConnectionInfo.h"
 #include "nsHttpConnection.h"
 #include "nsHttpTransaction.h"
-#include "NullHttpTransaction.h"
 #include "nsTArray.h"
 #include "nsThreadUtils.h"
 #include "nsClassHashtable.h"
 #include "nsDataHashtable.h"
 #include "nsAutoPtr.h"
 #include "mozilla/ReentrantMonitor.h"
-#include "nsISocketTransportService.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/net/DashboardTypes.h"

 #include "nsIObserver.h"
 #include "nsITimer.h"
-#include "nsIX509Cert3.h"

 class nsHttpPipeline;

@ -32,6 +27,7 @@ class nsIHttpUpgradeListener;
 namespace mozilla {
 namespace net {
 class EventTokenBucket;
+struct HttpRetParams;
 }
 }

--- a/netwerk/protocol/http/nsHttpDigestAuth.cpp
+++ b/netwerk/protocol/http/nsHttpDigestAuth.cpp
@ -10,17 +10,14 @@
 #include "nsHttp.h"
 #include "nsHttpDigestAuth.h"
 #include "nsIHttpAuthenticableChannel.h"
-#include "nsIServiceManager.h"
-#include "nsXPCOM.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIURI.h"
 #include "nsString.h"
-#include "nsReadableUtils.h"
 #include "nsEscape.h"
 #include "nsNetCID.h"
-#include "plbase64.h"
 #include "prprf.h"
 #include "nsCRT.h"
+#include "nsICryptoHash.h"

 //-----------------------------------------------------------------------------
 // nsHttpDigestAuth <public>
--- a/netwerk/protocol/http/nsHttpDigestAuth.h
+++ b/netwerk/protocol/http/nsHttpDigestAuth.h
@ -8,11 +8,12 @@
 #define nsDigestAuth_h__

 #include "nsIHttpAuthenticator.h"
-#include "nsICryptoHash.h"
-#include "nsString.h"
+#include "nsStringFwd.h"
 #include "nsCOMPtr.h"
 #include "mozilla/Attributes.h"

+class nsICryptoHash;
+
 #define ALGO_SPECIFIED 0x01
 #define ALGO_MD5 0x02
 #define ALGO_MD5_SESS 0x04
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@ -10,9 +10,6 @@
 #include "nsHttp.h"
 #include "nsHttpHandler.h"
 #include "nsHttpChannel.h"
-#include "nsHttpConnection.h"
-#include "nsHttpResponseHead.h"
-#include "nsHttpTransaction.h"
 #include "nsHttpAuthCache.h"
 #include "nsStandardURL.h"
 #include "nsIDOMConnection.h"
@ -21,12 +18,10 @@
 #include "nsIMozNavigatorNetwork.h"
 #include "nsINetworkProperties.h"
 #include "nsIHttpChannel.h"
-#include "nsIURL.h"
 #include "nsIStandardURL.h"
 #include "LoadContextInfo.h"
 #include "nsICacheStorageService.h"
 #include "nsICacheStorage.h"
-#include "nsICategoryManager.h"
 #include "nsCategoryManagerUtils.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
@ -37,20 +32,22 @@
 #include "nsCOMPtr.h"
 #include "nsNetCID.h"
 #include "prprf.h"
-#include "nsReadableUtils.h"
-#include "nsQuickSort.h"
 #include "nsNetUtil.h"
-#include "nsIOService.h"
 #include "nsAsyncRedirectVerifyHelper.h"
 #include "nsSocketTransportService2.h"
 #include "nsAlgorithm.h"
 #include "ASpdySession.h"
 #include "mozIApplicationClearPrivateDataParams.h"
-#include "nsICancelable.h"
 #include "EventTokenBucket.h"
 #include "Tickler.h"
-
 #include "nsIXULAppInfo.h"
+#include "nsICacheSession.h"
+#include "nsICookieService.h"
+#include "nsIObserverService.h"
+#include "nsISiteSecurityService.h"
+#include "nsIStreamConverterService.h"
+#include "nsITimer.h"
+#include "nsCRT.h"

 #include "mozilla/net/NeckoChild.h"
 #include "mozilla/Telemetry.h"
--- a/netwerk/protocol/http/nsHttpHandler.h
+++ b/netwerk/protocol/http/nsHttpHandler.h
@ -8,34 +8,31 @@

 #include "nsHttp.h"
 #include "nsHttpAuthCache.h"
-#include "nsHttpConnection.h"
 #include "nsHttpConnectionMgr.h"
 #include "ASpdySession.h"

-#include "nsXPIDLString.h"
 #include "nsString.h"
 #include "nsCOMPtr.h"
 #include "nsWeakReference.h"

 #include "nsIHttpProtocolHandler.h"
-#include "nsIProtocolProxyService.h"
-#include "nsIIOService.h"
 #include "nsIObserver.h"
-#include "nsIObserverService.h"
-#include "nsIStreamConverterService.h"
-#include "nsICacheSession.h"
-#include "nsICookieService.h"
-#include "nsITimer.h"
-#include "nsISiteSecurityService.h"
 #include "nsISpeculativeConnect.h"
+#include "nsICache.h"

+class nsHttpConnection;
 class nsHttpConnectionInfo;
 class nsHttpHeaderArray;
 class nsHttpTransaction;
-class nsAHttpTransaction;
 class nsIHttpChannel;
 class nsIPrefBranch;
 class nsICancelable;
+class nsICookieService;
+class nsIIOService;
+class nsIObserverService;
+class nsISiteSecurityService;
+class nsIStreamConverterService;
+class nsITimer;

 namespace mozilla {
 namespace net {
--- a/netwerk/protocol/http/nsHttpHeaderArray.cpp
+++ b/netwerk/protocol/http/nsHttpHeaderArray.cpp
@ -8,7 +8,8 @@
 #include "HttpLog.h"

 #include "nsHttpHeaderArray.h"
-#include "nsHttp.h"
+#include "nsURLHelper.h"
+#include "nsIHttpHeaderVisitor.h"

 //-----------------------------------------------------------------------------
 // nsHttpHeaderArray <public>
--- a/netwerk/protocol/http/nsHttpHeaderArray.h
+++ b/netwerk/protocol/http/nsHttpHeaderArray.h
@ -9,11 +9,10 @@

 #include "nsHttp.h"
 #include "nsTArray.h"
-#include "nsIHttpChannel.h"
-#include "nsIHttpHeaderVisitor.h"
-#include "nsCOMPtr.h"
 #include "nsString.h"

+class nsIHttpHeaderVisitor;
+
 class nsHttpHeaderArray
 {
 public:
--- a/netwerk/protocol/http/nsHttpNTLMAuth.cpp
+++ b/netwerk/protocol/http/nsHttpNTLMAuth.cpp
@ -6,9 +6,7 @@
 // HttpLog.h should generally be included first
 #include "HttpLog.h"

-#include "nsHttp.h"
 #include "nsHttpNTLMAuth.h"
-#include "nsIComponentManager.h"
 #include "nsIAuthModule.h"
 #include "nsCOMPtr.h"
 #include "plbase64.h"
@ -18,12 +16,13 @@

 #include "nsIPrefBranch.h"
 #include "nsIPrefService.h"
-#include "nsIServiceManager.h"
 #include "nsIHttpAuthenticableChannel.h"
 #include "nsIURI.h"
+#ifdef XP_WIN
 #include "nsIX509Cert.h"
 #include "nsISSLStatus.h"
 #include "nsISSLStatusProvider.h"
+#endif
 #include "mozilla/Attributes.h"

 static const char kAllowProxies[] = "network.automatic-ntlm-auth.allow-proxies";
--- a/netwerk/protocol/http/nsHttpPipeline.cpp
+++ b/netwerk/protocol/http/nsHttpPipeline.cpp
@ -6,16 +6,12 @@
 // HttpLog.h should generally be included first
 #include "HttpLog.h"

-#include "nsHttp.h"
 #include "nsHttpPipeline.h"
 #include "nsHttpHandler.h"
 #include "nsIOService.h"
-#include "nsIRequest.h"
 #include "nsISocketTransport.h"
-#include "nsIStringStream.h"
 #include "nsIPipe.h"
 #include "nsCOMPtr.h"
-#include "nsComponentManagerUtils.h"
 #include <algorithm>

 #ifdef DEBUG
--- a/netwerk/protocol/http/nsHttpPipeline.h
+++ b/netwerk/protocol/http/nsHttpPipeline.h
@ -6,14 +6,14 @@
 #ifndef nsHttpPipeline_h__
 #define nsHttpPipeline_h__

-#include "nsHttp.h"
 #include "nsAHttpConnection.h"
 #include "nsAHttpTransaction.h"
-#include "nsIInputStream.h"
-#include "nsIOutputStream.h"
 #include "nsTArray.h"
 #include "nsCOMPtr.h"

+class nsIInputStream;
+class nsIOutputStream;
+
 class nsHttpPipeline : public nsAHttpConnection
                     , public nsAHttpTransaction
                     , public nsAHttpSegmentReader
--- a/netwerk/protocol/http/nsHttpRequestHead.h
+++ b/netwerk/protocol/http/nsHttpRequestHead.h
@ -9,7 +9,6 @@
 #include "nsHttp.h"
 #include "nsHttpHeaderArray.h"
 #include "nsString.h"
-#include "nsCRT.h"

 //-----------------------------------------------------------------------------
 // nsHttpRequestHead represents the request line and headers from an HTTP
--- a/netwerk/protocol/http/nsHttpResponseHead.cpp
+++ b/netwerk/protocol/http/nsHttpResponseHead.cpp
@ -9,9 +9,8 @@

 #include "nsHttpResponseHead.h"
 #include "nsPrintfCString.h"
-#include "prprf.h"
 #include "prtime.h"
-#include "nsCRT.h"
+#include "nsURLHelper.h"
 #include <algorithm>

 //-----------------------------------------------------------------------------
--- a/netwerk/protocol/http/nsHttpTransaction.cpp
+++ b/netwerk/protocol/http/nsHttpTransaction.cpp
@ -9,20 +9,16 @@

 #include "base/basictypes.h"

-#include "nsIOService.h"
 #include "nsHttpHandler.h"
 #include "nsHttpTransaction.h"
-#include "nsHttpConnection.h"
 #include "nsHttpRequestHead.h"
 #include "nsHttpResponseHead.h"
 #include "nsHttpChunkedDecoder.h"
 #include "nsTransportUtils.h"
 #include "nsNetUtil.h"
-#include "nsProxyRelease.h"
-#include "nsIOService.h"
+#include "nsCRT.h"

 #include "nsISeekableStream.h"
-#include "nsISocketTransport.h"
 #include "nsMultiplexInputStream.h"
 #include "nsStringStream.h"
 #include "mozilla/VisualEventTracer.h"
@ -32,6 +28,10 @@
 #include "nsIHttpActivityObserver.h"
 #include "nsSocketTransportService2.h"
 #include "nsICancelable.h"
+#include "nsIEventTarget.h"
+#include "nsIInputStream.h"
+#include "nsITransport.h"
+#include "nsIOService.h"
 #include <algorithm>


--- a/netwerk/protocol/http/nsHttpTransaction.h
+++ b/netwerk/protocol/http/nsHttpTransaction.h
@ -7,20 +7,13 @@
 #define nsHttpTransaction_h__

 #include "nsHttp.h"
-#include "nsHttpHeaderArray.h"
 #include "nsAHttpTransaction.h"
 #include "nsAHttpConnection.h"
 #include "EventTokenBucket.h"
 #include "nsCOMPtr.h"
 #include "nsThreadUtils.h"
-#include "nsIPipe.h"
-#include "nsIInputStream.h"
 #include "nsILoadGroup.h"
-#include "nsIOutputStream.h"
 #include "nsIInterfaceRequestor.h"
-#include "nsISocketTransportService.h"
-#include "nsITransport.h"
-#include "nsIEventTarget.h"
 #include "TimingStruct.h"

 //-----------------------------------------------------------------------------
@ -29,7 +22,9 @@ class nsHttpRequestHead;
 class nsHttpResponseHead;
 class nsHttpChunkedDecoder;
 class nsIHttpActivityObserver;
-class UpdateSecurityCallbacks;
+class nsIEventTarget;
+class nsIInputStream;
+class nsIOutputStream;

 //-----------------------------------------------------------------------------
 // nsHttpTransaction represents a single HTTP transaction.  It is thread-safe,
--- a/netwerk/protocol/res/nsResProtocolHandler.cpp
+++ b/netwerk/protocol/res/nsResProtocolHandler.cpp
@ -6,14 +6,8 @@
 #include "mozilla/chrome/RegistryMessageUtils.h"

 #include "nsResProtocolHandler.h"
-#include "nsIURL.h"
 #include "nsIIOService.h"
-#include "nsIServiceManager.h"
-#include "prenv.h"
-#include "prprf.h"
-#include "nsXPIDLString.h"
 #include "nsIFile.h"
-#include "nsDirectoryServiceDefs.h"
 #include "nsNetUtil.h"
 #include "nsURLHelper.h"
 #include "nsEscape.h"
--- a/netwerk/protocol/res/nsResProtocolHandler.h
+++ b/netwerk/protocol/res/nsResProtocolHandler.h
@ -8,10 +8,10 @@

 #include "nsIResProtocolHandler.h"
 #include "nsInterfaceHashtable.h"
-#include "nsIIOService.h"
 #include "nsWeakReference.h"
 #include "nsStandardURL.h"

+class nsIIOService;
 struct ResourceMapping;

 // nsResURL : overrides nsStandardURL::GetFile to provide nsIFile resolution
--- a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp
+++ b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp
@ -6,15 +6,9 @@

 #include "nsViewSourceChannel.h"
 #include "nsIIOService.h"
-#include "nsIServiceManager.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsXPIDLString.h"
-#include "nsReadableUtils.h"
 #include "nsMimeTypes.h"
 #include "nsNetUtil.h"
 #include "nsIHttpHeaderVisitor.h"
-#include "nsStringStream.h"

 NS_IMPL_ADDREF(nsViewSourceChannel)
 NS_IMPL_RELEASE(nsViewSourceChannel)
--- a/netwerk/protocol/viewsource/nsViewSourceChannel.h
+++ b/netwerk/protocol/viewsource/nsViewSourceChannel.h
@ -8,12 +8,9 @@

 #include "nsString.h"
 #include "nsCOMPtr.h"
-#include "nsXPIDLString.h"
 #include "nsIViewSourceChannel.h"
 #include "nsIURI.h"
 #include "nsIStreamListener.h"
-#include "nsViewSourceHandler.h"
-#include "nsNetCID.h"
 #include "nsIHttpChannel.h"
 #include "nsIHttpChannelInternal.h"
 #include "nsICachingChannel.h"
--- a/netwerk/protocol/websocket/BaseWebSocketChannel.cpp
+++ b/netwerk/protocol/websocket/BaseWebSocketChannel.cpp
@ -8,7 +8,6 @@
 #include "BaseWebSocketChannel.h"
 #include "nsILoadGroup.h"
 #include "nsIInterfaceRequestor.h"
-#include "nsIURI.h"
 #include "nsAutoPtr.h"
 #include "nsStandardURL.h"

--- a/netwerk/protocol/websocket/WebSocketChannel.cpp
+++ b/netwerk/protocol/websocket/WebSocketChannel.cpp
@ -7,7 +7,6 @@
 #include "WebSocketLog.h"
 #include "WebSocketChannel.h"

-#include "nsISocketTransportService.h"
 #include "nsIURI.h"
 #include "nsIChannel.h"
 #include "nsICryptoHash.h"
@ -22,12 +21,18 @@
 #include "nsIProtocolProxyService.h"
 #include "nsIProxyInfo.h"
 #include "nsIProxiedChannel.h"
+#include "nsIAsyncVerifyRedirectCallback.h"
+#include "nsIDashboardEventNotifier.h"
+#include "nsIEventTarget.h"
+#include "nsIHttpChannel.h"
+#include "nsILoadGroup.h"
+#include "nsIProtocolHandler.h"
+#include "nsIRandomGenerator.h"
+#include "nsISocketTransport.h"

 #include "nsAutoPtr.h"
-#include "nsStandardURL.h"
 #include "nsNetCID.h"
 #include "nsServiceManagerUtils.h"
-#include "nsXPIDLString.h"
 #include "nsCRT.h"
 #include "nsThreadUtils.h"
 #include "nsError.h"
--- a/netwerk/protocol/websocket/WebSocketChannel.h
+++ b/netwerk/protocol/websocket/WebSocketChannel.h
@ -7,31 +7,29 @@
 #ifndef mozilla_net_WebSocketChannel_h
 #define mozilla_net_WebSocketChannel_h

-#include "nsIURI.h"
 #include "nsISupports.h"
 #include "nsIInterfaceRequestor.h"
-#include "nsIEventTarget.h"
 #include "nsIStreamListener.h"
-#include "nsIProtocolHandler.h"
-#include "nsISocketTransport.h"
 #include "nsIAsyncInputStream.h"
 #include "nsIAsyncOutputStream.h"
-#include "nsILoadGroup.h"
 #include "nsITimer.h"
 #include "nsIDNSListener.h"
-#include "nsIHttpChannel.h"
 #include "nsIChannelEventSink.h"
-#include "nsIAsyncVerifyRedirectCallback.h"
-#include "nsIStringStream.h"
 #include "nsIHttpChannelInternal.h"
-#include "nsIRandomGenerator.h"
 #include "BaseWebSocketChannel.h"
-#include "nsIDashboardEventNotifier.h"

 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsDeque.h"

+class nsIAsyncVerifyRedirectCallback;
+class nsIDashboardEventNotifier;
+class nsIEventTarget;
+class nsIHttpChannel;
+class nsIRandomGenerator;
+class nsISocketTransport;
+class nsIURI;
+
 namespace mozilla { namespace net {

 class OutboundMessage;
--- a/netwerk/protocol/websocket/WebSocketChannelChild.cpp
+++ b/netwerk/protocol/websocket/WebSocketChannelChild.cpp
@ -10,10 +10,10 @@
 #include "mozilla/net/NeckoChild.h"
 #include "WebSocketChannelChild.h"
 #include "nsITabChild.h"
-#include "nsILoadContext.h"
 #include "nsNetUtil.h"
 #include "mozilla/ipc/InputStreamUtils.h"
 #include "mozilla/ipc/URIUtils.h"
+#include "mozilla/net/ChannelEventQueue.h"

 using namespace mozilla::ipc;

--- a/netwerk/protocol/websocket/WebSocketChannelChild.h
+++ b/netwerk/protocol/websocket/WebSocketChannelChild.h
@ -8,14 +8,14 @@
 #define mozilla_net_WebSocketChannelChild_h

 #include "mozilla/net/PWebSocketChild.h"
-#include "mozilla/net/ChannelEventQueue.h"
 #include "mozilla/net/BaseWebSocketChannel.h"
-#include "nsCOMPtr.h"
 #include "nsString.h"

 namespace mozilla {
 namespace net {

+class ChannelEventQueue;
+
 class WebSocketChannelChild : public BaseWebSocketChannel,
                              public PWebSocketChild
 {
--- a/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp
+++ b/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp
@ -6,17 +6,16 @@

 #include "base/compiler_specific.h"

-#include "mozilla/net/NeckoChild.h"
+#include "mozilla/net/ChannelEventQueue.h"
 #include "WyciwygChannelChild.h"
 #include "mozilla/dom/TabChild.h"

 #include "nsCharsetSource.h"
 #include "nsStringStream.h"
-#include "nsMimeTypes.h"
 #include "nsNetUtil.h"
 #include "nsISerializable.h"
 #include "nsSerializationHelper.h"
-#include "nsILoadContext.h"
+#include "nsIProgressEventSink.h"
 #include "mozilla/ipc/URIUtils.h"

 using namespace mozilla::ipc;
--- a/netwerk/protocol/wyciwyg/WyciwygChannelChild.h
+++ b/netwerk/protocol/wyciwyg/WyciwygChannelChild.h
@ -6,15 +6,17 @@
 #define mozilla_net_WyciwygChannelChild_h

 #include "mozilla/net/PWyciwygChannelChild.h"
-#include "mozilla/net/ChannelEventQueue.h"
 #include "nsIWyciwygChannel.h"
 #include "nsIChannel.h"
-#include "nsIProgressEventSink.h"
 #include "PrivateBrowsingChannel.h"

+class nsIProgressEventSink;
+
 namespace mozilla {
 namespace net {

+class ChannelEventQueue;
+
 // TODO: replace with IPDL states
 enum WyciwygChannelChildState {
  WCC_NEW,
--- a/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp
+++ b/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp
@ -7,7 +7,6 @@
 #include "mozilla/net/WyciwygChannelParent.h"
 #include "nsWyciwygChannel.h"
 #include "nsNetUtil.h"
-#include "nsISupportsPriority.h"
 #include "nsCharsetSource.h"
 #include "nsISerializable.h"
 #include "nsSerializationHelper.h"
--- a/netwerk/protocol/wyciwyg/nsWyciwyg.h
+++ b/netwerk/protocol/wyciwyg/nsWyciwyg.h
@ -25,9 +25,7 @@
 #include "mozilla/net/NeckoChild.h"
 #undef LOG

-#include "plstr.h"
 #include "prlog.h"
-#include "prtime.h"

 #if defined(PR_LOGGING)
 //
--- a/netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp
+++ b/netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp
@ -6,15 +6,21 @@

 #include "nsWyciwyg.h"
 #include "nsWyciwygChannel.h"
-#include "nsIServiceManager.h"
 #include "nsILoadGroup.h"
-#include "nsIScriptSecurityManager.h"
 #include "nsNetUtil.h"
 #include "nsICacheService.h"
 #include "nsICacheSession.h"
 #include "nsCharsetSource.h"
 #include "nsProxyRelease.h"
 #include "nsThreadUtils.h"
+#include "nsICacheEntryDescriptor.h"
+#include "nsIEventTarget.h"
+#include "nsIInputStream.h"
+#include "nsIInputStreamPump.h"
+#include "nsIOutputStream.h"
+#include "nsIProgressEventSink.h"
+#include "nsIURI.h"
+#include "nsWyciwygProtocolHandler.h"

 // Must release mChannel on the main thread
 class nsWyciwygAsyncEvent : public nsRunnable {
--- a/netwerk/protocol/wyciwyg/nsWyciwygChannel.h
+++ b/netwerk/protocol/wyciwyg/nsWyciwygChannel.h
@ -7,27 +7,23 @@
 #ifndef nsWyciwygChannel_h___
 #define nsWyciwygChannel_h___

-#include "nsWyciwygProtocolHandler.h"
-#include "nsXPIDLString.h"
 #include "nsString.h"
 #include "nsCOMPtr.h"

 #include "nsIWyciwygChannel.h"
-#include "nsILoadGroup.h"
-#include "nsIOutputStream.h"
-#include "nsIInputStream.h"
-#include "nsIInputStreamPump.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIProgressEventSink.h"
 #include "nsIStreamListener.h"
 #include "nsICacheListener.h"
-#include "nsICacheEntryDescriptor.h"
-#include "nsIURI.h"
-#include "nsIEventTarget.h"
-#include "nsILoadContext.h"
-#include "nsNetUtil.h"
 #include "PrivateBrowsingChannel.h"

+class nsICacheEntryDescriptor;
+class nsIEventTarget;
+class nsIInputStream;
+class nsIInputStreamPump;
+class nsILoadGroup;
+class nsIOutputStream;
+class nsIProgressEventSink;
+class nsIURI;
+
 extern PRLogModuleInfo * gWyciwygLog;

 //-----------------------------------------------------------------------------
--- a/netwerk/protocol/wyciwyg/nsWyciwygProtocolHandler.cpp
+++ b/netwerk/protocol/wyciwyg/nsWyciwygProtocolHandler.cpp
@ -7,8 +7,6 @@
 #include "nsWyciwyg.h"
 #include "nsWyciwygChannel.h"
 #include "nsWyciwygProtocolHandler.h"
-#include "nsIURL.h"
-#include "nsIComponentManager.h"
 #include "nsNetCID.h"
 #include "nsServiceManagerUtils.h"
 #include "plstr.h"