Bug 1100184 - Flatten netwerk/base/{public,src}/ directories. r=mcmanus, r=poiru
authorJames Kitchener <jkitch.bug@internode.on.net>
Tue, 20 Jan 2015 03:58:00 -0500
changeset 224865 4ec37503ea6a752baf92e053ede5f0ff7750ff36
parent 224864 0028312fac1d39e82f93ab63f0e3848a629766fe
child 224866 3de3af63a33f315e94b29963667184b9e067574a
push id10916
push usercbook@mozilla.com
push dateWed, 21 Jan 2015 13:36:00 +0000
treeherderfx-team@26f23dfdca44 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcmanus, poiru
bugs1100184
milestone38.0a1
Bug 1100184 - Flatten netwerk/base/{public,src}/ directories. r=mcmanus, r=poiru
chrome/moz.build
dom/base/moz.build
dom/html/moz.build
dom/ipc/moz.build
dom/jsurl/moz.build
dom/media/moz.build
dom/security/moz.build
image/src/moz.build
layout/build/moz.build
mobile/android/base/GeckoAppShell.java
mobile/android/base/GeckoConnectivityReceiver.java
modules/libpref/Makefile.in
netwerk/base/ADivertableParentChannel.h
netwerk/base/ArrayBufferInputStream.cpp
netwerk/base/ArrayBufferInputStream.h
netwerk/base/AutoClose.h
netwerk/base/BackgroundFileSaver.cpp
netwerk/base/BackgroundFileSaver.h
netwerk/base/ChannelDiverterChild.cpp
netwerk/base/ChannelDiverterChild.h
netwerk/base/ChannelDiverterParent.cpp
netwerk/base/ChannelDiverterParent.h
netwerk/base/Dashboard.cpp
netwerk/base/Dashboard.h
netwerk/base/DashboardTypes.h
netwerk/base/EventTokenBucket.cpp
netwerk/base/EventTokenBucket.h
netwerk/base/LoadContextInfo.cpp
netwerk/base/LoadContextInfo.h
netwerk/base/NetStatistics.h
netwerk/base/NetUtil.jsm
netwerk/base/NetworkActivityMonitor.cpp
netwerk/base/NetworkActivityMonitor.h
netwerk/base/OfflineObserver.cpp
netwerk/base/OfflineObserver.h
netwerk/base/Predictor.cpp
netwerk/base/Predictor.h
netwerk/base/PrivateBrowsingChannel.h
netwerk/base/ProxyAutoConfig.cpp
netwerk/base/ProxyAutoConfig.h
netwerk/base/RedirectChannelRegistrar.cpp
netwerk/base/RedirectChannelRegistrar.h
netwerk/base/ReferrerPolicy.h
netwerk/base/StreamingProtocolService.cpp
netwerk/base/StreamingProtocolService.h
netwerk/base/TLSServerSocket.cpp
netwerk/base/TLSServerSocket.h
netwerk/base/Tickler.cpp
netwerk/base/Tickler.h
netwerk/base/moz.build
netwerk/base/mozIThirdPartyUtil.idl
netwerk/base/netCore.h
netwerk/base/nsASocketHandler.h
netwerk/base/nsAsyncRedirectVerifyHelper.cpp
netwerk/base/nsAsyncRedirectVerifyHelper.h
netwerk/base/nsAsyncStreamCopier.cpp
netwerk/base/nsAsyncStreamCopier.h
netwerk/base/nsAuthInformationHolder.cpp
netwerk/base/nsAuthInformationHolder.h
netwerk/base/nsAutodialQt.cpp
netwerk/base/nsAutodialQt.h
netwerk/base/nsAutodialWin.cpp
netwerk/base/nsAutodialWin.h
netwerk/base/nsBase64Encoder.cpp
netwerk/base/nsBase64Encoder.h
netwerk/base/nsBaseChannel.cpp
netwerk/base/nsBaseChannel.h
netwerk/base/nsBaseContentStream.cpp
netwerk/base/nsBaseContentStream.h
netwerk/base/nsBufferedStreams.cpp
netwerk/base/nsBufferedStreams.h
netwerk/base/nsChannelClassifier.cpp
netwerk/base/nsChannelClassifier.h
netwerk/base/nsDNSPrefetch.cpp
netwerk/base/nsDNSPrefetch.h
netwerk/base/nsDirectoryIndexStream.cpp
netwerk/base/nsDirectoryIndexStream.h
netwerk/base/nsDownloader.cpp
netwerk/base/nsDownloader.h
netwerk/base/nsFileStreams.cpp
netwerk/base/nsFileStreams.h
netwerk/base/nsIApplicationCache.idl
netwerk/base/nsIApplicationCacheChannel.idl
netwerk/base/nsIApplicationCacheContainer.idl
netwerk/base/nsIApplicationCacheService.idl
netwerk/base/nsIArrayBufferInputStream.idl
netwerk/base/nsIAsyncStreamCopier.idl
netwerk/base/nsIAsyncStreamCopier2.idl
netwerk/base/nsIAsyncVerifyRedirectCallback.idl
netwerk/base/nsIAuthInformation.idl
netwerk/base/nsIAuthModule.idl
netwerk/base/nsIAuthPrompt.idl
netwerk/base/nsIAuthPrompt2.idl
netwerk/base/nsIAuthPromptAdapterFactory.idl
netwerk/base/nsIAuthPromptCallback.idl
netwerk/base/nsIAuthPromptProvider.idl
netwerk/base/nsIBackgroundFileSaver.idl
netwerk/base/nsIBrowserSearchService.idl
netwerk/base/nsIBufferedStreams.idl
netwerk/base/nsIByteRangeRequest.idl
netwerk/base/nsICacheInfoChannel.idl
netwerk/base/nsICachingChannel.idl
netwerk/base/nsICancelable.idl
netwerk/base/nsIChannel.idl
netwerk/base/nsIChannelEventSink.idl
netwerk/base/nsIChildChannel.idl
netwerk/base/nsIClassOfService.idl
netwerk/base/nsIContentSniffer.idl
netwerk/base/nsICryptoFIPSInfo.idl
netwerk/base/nsICryptoHMAC.idl
netwerk/base/nsICryptoHash.idl
netwerk/base/nsIDashboard.idl
netwerk/base/nsIDashboardEventNotifier.idl
netwerk/base/nsIDivertableChannel.idl
netwerk/base/nsIDownloader.idl
netwerk/base/nsIEncodedChannel.idl
netwerk/base/nsIExternalProtocolHandler.idl
netwerk/base/nsIFileStreams.idl
netwerk/base/nsIFileURL.idl
netwerk/base/nsIForcePendingChannel.idl
netwerk/base/nsIHttpPushListener.idl
netwerk/base/nsIIOService.idl
netwerk/base/nsIIOService2.idl
netwerk/base/nsIIncrementalDownload.idl
netwerk/base/nsIInputStreamChannel.idl
netwerk/base/nsIInputStreamPump.idl
netwerk/base/nsILoadContextInfo.idl
netwerk/base/nsILoadGroup.idl
netwerk/base/nsILoadGroupChild.idl
netwerk/base/nsIMIMEInputStream.idl
netwerk/base/nsIMultiPartChannel.idl
netwerk/base/nsINSSErrorsService.idl
netwerk/base/nsINestedURI.idl
netwerk/base/nsINetAddr.idl
netwerk/base/nsINetUtil.idl
netwerk/base/nsINetworkInterceptController.idl
netwerk/base/nsINetworkLinkService.idl
netwerk/base/nsINetworkPredictor.idl
netwerk/base/nsINetworkPredictorVerifier.idl
netwerk/base/nsINetworkProperties.idl
netwerk/base/nsINullChannel.idl
netwerk/base/nsIOService.cpp
netwerk/base/nsIOService.h
netwerk/base/nsIParentChannel.idl
netwerk/base/nsIParentRedirectingChannel.idl
netwerk/base/nsIPermission.idl
netwerk/base/nsIPermissionManager.idl
netwerk/base/nsIPrivateBrowsingChannel.idl
netwerk/base/nsIProgressEventSink.idl
netwerk/base/nsIPrompt.idl
netwerk/base/nsIProtocolHandler.idl
netwerk/base/nsIProtocolProxyCallback.idl
netwerk/base/nsIProtocolProxyFilter.idl
netwerk/base/nsIProtocolProxyService.idl
netwerk/base/nsIProtocolProxyService2.idl
netwerk/base/nsIProxiedChannel.idl
netwerk/base/nsIProxiedProtocolHandler.idl
netwerk/base/nsIProxyInfo.idl
netwerk/base/nsIRandomGenerator.idl
netwerk/base/nsIRedirectChannelRegistrar.idl
netwerk/base/nsIRedirectHistory.idl
netwerk/base/nsIRedirectResultListener.idl
netwerk/base/nsIRequest.idl
netwerk/base/nsIRequestObserver.idl
netwerk/base/nsIRequestObserverProxy.idl
netwerk/base/nsIResumableChannel.idl
netwerk/base/nsISecretDecoderRing.idl
netwerk/base/nsISecureBrowserUI.idl
netwerk/base/nsISecurityEventSink.idl
netwerk/base/nsISecurityInfoProvider.idl
netwerk/base/nsISerializationHelper.idl
netwerk/base/nsIServerSocket.idl
netwerk/base/nsISimpleStreamListener.idl
netwerk/base/nsISiteSecurityService.idl
netwerk/base/nsISocketTransport.idl
netwerk/base/nsISocketTransportService.idl
netwerk/base/nsISpeculativeConnect.idl
netwerk/base/nsIStandardURL.idl
netwerk/base/nsIStreamListener.idl
netwerk/base/nsIStreamListenerTee.idl
netwerk/base/nsIStreamLoader.idl
netwerk/base/nsIStreamTransportService.idl
netwerk/base/nsIStreamingProtocolController.idl
netwerk/base/nsIStreamingProtocolService.idl
netwerk/base/nsISyncStreamListener.idl
netwerk/base/nsISystemProxySettings.idl
netwerk/base/nsITLSServerSocket.idl
netwerk/base/nsIThreadRetargetableRequest.idl
netwerk/base/nsIThreadRetargetableStreamListener.idl
netwerk/base/nsITimedChannel.idl
netwerk/base/nsITraceableChannel.idl
netwerk/base/nsITransport.idl
netwerk/base/nsIUDPSocket.idl
netwerk/base/nsIUDPSocketFilter.idl
netwerk/base/nsIURI.idl
netwerk/base/nsIURIChecker.idl
netwerk/base/nsIURIClassifier.idl
netwerk/base/nsIURIWithPrincipal.idl
netwerk/base/nsIURL.idl
netwerk/base/nsIURLParser.idl
netwerk/base/nsIUnicharStreamLoader.idl
netwerk/base/nsIUploadChannel.idl
netwerk/base/nsIUploadChannel2.idl
netwerk/base/nsIncrementalDownload.cpp
netwerk/base/nsInputStreamChannel.cpp
netwerk/base/nsInputStreamChannel.h
netwerk/base/nsInputStreamPump.cpp
netwerk/base/nsInputStreamPump.h
netwerk/base/nsLoadGroup.cpp
netwerk/base/nsLoadGroup.h
netwerk/base/nsMIMEInputStream.cpp
netwerk/base/nsMIMEInputStream.h
netwerk/base/nsMediaFragmentURIParser.cpp
netwerk/base/nsMediaFragmentURIParser.h
netwerk/base/nsNativeConnectionHelper.cpp
netwerk/base/nsNativeConnectionHelper.h
netwerk/base/nsNetAddr.cpp
netwerk/base/nsNetAddr.h
netwerk/base/nsNetSegmentUtils.h
netwerk/base/nsNetUtil.cpp
netwerk/base/nsNetUtil.h
netwerk/base/nsPACMan.cpp
netwerk/base/nsPACMan.h
netwerk/base/nsPILoadGroupInternal.idl
netwerk/base/nsPISocketTransportService.idl
netwerk/base/nsPreloadedStream.cpp
netwerk/base/nsPreloadedStream.h
netwerk/base/nsProtocolProxyService.cpp
netwerk/base/nsProtocolProxyService.h
netwerk/base/nsProxyInfo.cpp
netwerk/base/nsProxyInfo.h
netwerk/base/nsReadLine.h
netwerk/base/nsRequestObserverProxy.cpp
netwerk/base/nsRequestObserverProxy.h
netwerk/base/nsSerializationHelper.cpp
netwerk/base/nsSerializationHelper.h
netwerk/base/nsServerSocket.cpp
netwerk/base/nsServerSocket.h
netwerk/base/nsSimpleNestedURI.cpp
netwerk/base/nsSimpleNestedURI.h
netwerk/base/nsSimpleStreamListener.cpp
netwerk/base/nsSimpleStreamListener.h
netwerk/base/nsSimpleURI.cpp
netwerk/base/nsSimpleURI.h
netwerk/base/nsSocketTransport2.cpp
netwerk/base/nsSocketTransport2.h
netwerk/base/nsSocketTransportService2.cpp
netwerk/base/nsSocketTransportService2.h
netwerk/base/nsStandardURL.cpp
netwerk/base/nsStandardURL.h
netwerk/base/nsStreamListenerTee.cpp
netwerk/base/nsStreamListenerTee.h
netwerk/base/nsStreamListenerWrapper.cpp
netwerk/base/nsStreamListenerWrapper.h
netwerk/base/nsStreamLoader.cpp
netwerk/base/nsStreamLoader.h
netwerk/base/nsStreamTransportService.cpp
netwerk/base/nsStreamTransportService.h
netwerk/base/nsSyncStreamListener.cpp
netwerk/base/nsSyncStreamListener.h
netwerk/base/nsTemporaryFileInputStream.cpp
netwerk/base/nsTemporaryFileInputStream.h
netwerk/base/nsTransportUtils.cpp
netwerk/base/nsTransportUtils.h
netwerk/base/nsUDPSocket.cpp
netwerk/base/nsUDPSocket.h
netwerk/base/nsURIChecker.cpp
netwerk/base/nsURIChecker.h
netwerk/base/nsURIHashKey.h
netwerk/base/nsURLHelper.cpp
netwerk/base/nsURLHelper.h
netwerk/base/nsURLHelperOSX.cpp
netwerk/base/nsURLHelperUnix.cpp
netwerk/base/nsURLHelperWin.cpp
netwerk/base/nsURLParsers.cpp
netwerk/base/nsURLParsers.h
netwerk/base/nsUnicharStreamLoader.cpp
netwerk/base/nsUnicharStreamLoader.h
netwerk/base/public/NetStatistics.h
netwerk/base/public/ReferrerPolicy.h
netwerk/base/public/moz.build
netwerk/base/public/mozIThirdPartyUtil.idl
netwerk/base/public/netCore.h
netwerk/base/public/nsASocketHandler.h
netwerk/base/public/nsAsyncRedirectVerifyHelper.h
netwerk/base/public/nsIApplicationCache.idl
netwerk/base/public/nsIApplicationCacheChannel.idl
netwerk/base/public/nsIApplicationCacheContainer.idl
netwerk/base/public/nsIApplicationCacheService.idl
netwerk/base/public/nsIArrayBufferInputStream.idl
netwerk/base/public/nsIAsyncStreamCopier.idl
netwerk/base/public/nsIAsyncStreamCopier2.idl
netwerk/base/public/nsIAsyncVerifyRedirectCallback.idl
netwerk/base/public/nsIAuthInformation.idl
netwerk/base/public/nsIAuthModule.idl
netwerk/base/public/nsIAuthPrompt.idl
netwerk/base/public/nsIAuthPrompt2.idl
netwerk/base/public/nsIAuthPromptAdapterFactory.idl
netwerk/base/public/nsIAuthPromptCallback.idl
netwerk/base/public/nsIAuthPromptProvider.idl
netwerk/base/public/nsIBackgroundFileSaver.idl
netwerk/base/public/nsIBrowserSearchService.idl
netwerk/base/public/nsIBufferedStreams.idl
netwerk/base/public/nsIByteRangeRequest.idl
netwerk/base/public/nsICacheInfoChannel.idl
netwerk/base/public/nsICachingChannel.idl
netwerk/base/public/nsICancelable.idl
netwerk/base/public/nsIChannel.idl
netwerk/base/public/nsIChannelEventSink.idl
netwerk/base/public/nsIChildChannel.idl
netwerk/base/public/nsIClassOfService.idl
netwerk/base/public/nsIContentSniffer.idl
netwerk/base/public/nsICryptoFIPSInfo.idl
netwerk/base/public/nsICryptoHMAC.idl
netwerk/base/public/nsICryptoHash.idl
netwerk/base/public/nsIDashboard.idl
netwerk/base/public/nsIDashboardEventNotifier.idl
netwerk/base/public/nsIDivertableChannel.idl
netwerk/base/public/nsIDownloader.idl
netwerk/base/public/nsIEncodedChannel.idl
netwerk/base/public/nsIExternalProtocolHandler.idl
netwerk/base/public/nsIFileStreams.idl
netwerk/base/public/nsIFileURL.idl
netwerk/base/public/nsIForcePendingChannel.idl
netwerk/base/public/nsIHttpPushListener.idl
netwerk/base/public/nsIIOService.idl
netwerk/base/public/nsIIOService2.idl
netwerk/base/public/nsIIncrementalDownload.idl
netwerk/base/public/nsIInputStreamChannel.idl
netwerk/base/public/nsIInputStreamPump.idl
netwerk/base/public/nsILoadContextInfo.idl
netwerk/base/public/nsILoadGroup.idl
netwerk/base/public/nsILoadGroupChild.idl
netwerk/base/public/nsIMIMEInputStream.idl
netwerk/base/public/nsIMultiPartChannel.idl
netwerk/base/public/nsINSSErrorsService.idl
netwerk/base/public/nsINestedURI.idl
netwerk/base/public/nsINetAddr.idl
netwerk/base/public/nsINetUtil.idl
netwerk/base/public/nsINetworkInterceptController.idl
netwerk/base/public/nsINetworkLinkService.idl
netwerk/base/public/nsINetworkPredictor.idl
netwerk/base/public/nsINetworkPredictorVerifier.idl
netwerk/base/public/nsINetworkProperties.idl
netwerk/base/public/nsINullChannel.idl
netwerk/base/public/nsIParentChannel.idl
netwerk/base/public/nsIParentRedirectingChannel.idl
netwerk/base/public/nsIPermission.idl
netwerk/base/public/nsIPermissionManager.idl
netwerk/base/public/nsIPrivateBrowsingChannel.idl
netwerk/base/public/nsIProgressEventSink.idl
netwerk/base/public/nsIPrompt.idl
netwerk/base/public/nsIProtocolHandler.idl
netwerk/base/public/nsIProtocolProxyCallback.idl
netwerk/base/public/nsIProtocolProxyFilter.idl
netwerk/base/public/nsIProtocolProxyService.idl
netwerk/base/public/nsIProtocolProxyService2.idl
netwerk/base/public/nsIProxiedChannel.idl
netwerk/base/public/nsIProxiedProtocolHandler.idl
netwerk/base/public/nsIProxyInfo.idl
netwerk/base/public/nsIRandomGenerator.idl
netwerk/base/public/nsIRedirectChannelRegistrar.idl
netwerk/base/public/nsIRedirectHistory.idl
netwerk/base/public/nsIRedirectResultListener.idl
netwerk/base/public/nsIRequest.idl
netwerk/base/public/nsIRequestObserver.idl
netwerk/base/public/nsIRequestObserverProxy.idl
netwerk/base/public/nsIResumableChannel.idl
netwerk/base/public/nsISecretDecoderRing.idl
netwerk/base/public/nsISecureBrowserUI.idl
netwerk/base/public/nsISecurityEventSink.idl
netwerk/base/public/nsISecurityInfoProvider.idl
netwerk/base/public/nsISerializationHelper.idl
netwerk/base/public/nsIServerSocket.idl
netwerk/base/public/nsISimpleStreamListener.idl
netwerk/base/public/nsISiteSecurityService.idl
netwerk/base/public/nsISocketTransport.idl
netwerk/base/public/nsISocketTransportService.idl
netwerk/base/public/nsISpeculativeConnect.idl
netwerk/base/public/nsIStandardURL.idl
netwerk/base/public/nsIStreamListener.idl
netwerk/base/public/nsIStreamListenerTee.idl
netwerk/base/public/nsIStreamLoader.idl
netwerk/base/public/nsIStreamTransportService.idl
netwerk/base/public/nsIStreamingProtocolController.idl
netwerk/base/public/nsIStreamingProtocolService.idl
netwerk/base/public/nsISyncStreamListener.idl
netwerk/base/public/nsISystemProxySettings.idl
netwerk/base/public/nsITLSServerSocket.idl
netwerk/base/public/nsIThreadRetargetableRequest.idl
netwerk/base/public/nsIThreadRetargetableStreamListener.idl
netwerk/base/public/nsITimedChannel.idl
netwerk/base/public/nsITraceableChannel.idl
netwerk/base/public/nsITransport.idl
netwerk/base/public/nsIUDPSocket.idl
netwerk/base/public/nsIUDPSocketFilter.idl
netwerk/base/public/nsIURI.idl
netwerk/base/public/nsIURIChecker.idl
netwerk/base/public/nsIURIClassifier.idl
netwerk/base/public/nsIURIWithPrincipal.idl
netwerk/base/public/nsIURL.idl
netwerk/base/public/nsIURLParser.idl
netwerk/base/public/nsIUnicharStreamLoader.idl
netwerk/base/public/nsIUploadChannel.idl
netwerk/base/public/nsIUploadChannel2.idl
netwerk/base/public/nsNetUtil.h
netwerk/base/public/nsPILoadGroupInternal.idl
netwerk/base/public/nsPISocketTransportService.idl
netwerk/base/public/nsReadLine.h
netwerk/base/public/nsStreamListenerWrapper.h
netwerk/base/public/nsURIHashKey.h
netwerk/base/public/security-prefs.js
netwerk/base/security-prefs.js
netwerk/base/src/ADivertableParentChannel.h
netwerk/base/src/ArrayBufferInputStream.cpp
netwerk/base/src/ArrayBufferInputStream.h
netwerk/base/src/AutoClose.h
netwerk/base/src/BackgroundFileSaver.cpp
netwerk/base/src/BackgroundFileSaver.h
netwerk/base/src/ChannelDiverterChild.cpp
netwerk/base/src/ChannelDiverterChild.h
netwerk/base/src/ChannelDiverterParent.cpp
netwerk/base/src/ChannelDiverterParent.h
netwerk/base/src/Dashboard.cpp
netwerk/base/src/Dashboard.h
netwerk/base/src/DashboardTypes.h
netwerk/base/src/EventTokenBucket.cpp
netwerk/base/src/EventTokenBucket.h
netwerk/base/src/LoadContextInfo.cpp
netwerk/base/src/LoadContextInfo.h
netwerk/base/src/NetUtil.jsm
netwerk/base/src/NetworkActivityMonitor.cpp
netwerk/base/src/NetworkActivityMonitor.h
netwerk/base/src/OfflineObserver.cpp
netwerk/base/src/OfflineObserver.h
netwerk/base/src/Predictor.cpp
netwerk/base/src/Predictor.h
netwerk/base/src/PrivateBrowsingChannel.h
netwerk/base/src/ProxyAutoConfig.cpp
netwerk/base/src/ProxyAutoConfig.h
netwerk/base/src/RedirectChannelRegistrar.cpp
netwerk/base/src/RedirectChannelRegistrar.h
netwerk/base/src/StreamingProtocolService.cpp
netwerk/base/src/StreamingProtocolService.h
netwerk/base/src/TLSServerSocket.cpp
netwerk/base/src/TLSServerSocket.h
netwerk/base/src/Tickler.cpp
netwerk/base/src/Tickler.h
netwerk/base/src/moz.build
netwerk/base/src/nsAsyncRedirectVerifyHelper.cpp
netwerk/base/src/nsAsyncStreamCopier.cpp
netwerk/base/src/nsAsyncStreamCopier.h
netwerk/base/src/nsAuthInformationHolder.cpp
netwerk/base/src/nsAuthInformationHolder.h
netwerk/base/src/nsAutodialQt.cpp
netwerk/base/src/nsAutodialQt.h
netwerk/base/src/nsAutodialWin.cpp
netwerk/base/src/nsAutodialWin.h
netwerk/base/src/nsBase64Encoder.cpp
netwerk/base/src/nsBase64Encoder.h
netwerk/base/src/nsBaseChannel.cpp
netwerk/base/src/nsBaseChannel.h
netwerk/base/src/nsBaseContentStream.cpp
netwerk/base/src/nsBaseContentStream.h
netwerk/base/src/nsBufferedStreams.cpp
netwerk/base/src/nsBufferedStreams.h
netwerk/base/src/nsChannelClassifier.cpp
netwerk/base/src/nsChannelClassifier.h
netwerk/base/src/nsDNSPrefetch.cpp
netwerk/base/src/nsDNSPrefetch.h
netwerk/base/src/nsDirectoryIndexStream.cpp
netwerk/base/src/nsDirectoryIndexStream.h
netwerk/base/src/nsDownloader.cpp
netwerk/base/src/nsDownloader.h
netwerk/base/src/nsFileStreams.cpp
netwerk/base/src/nsFileStreams.h
netwerk/base/src/nsIOService.cpp
netwerk/base/src/nsIOService.h
netwerk/base/src/nsIncrementalDownload.cpp
netwerk/base/src/nsInputStreamChannel.cpp
netwerk/base/src/nsInputStreamChannel.h
netwerk/base/src/nsInputStreamPump.cpp
netwerk/base/src/nsInputStreamPump.h
netwerk/base/src/nsLoadGroup.cpp
netwerk/base/src/nsLoadGroup.h
netwerk/base/src/nsMIMEInputStream.cpp
netwerk/base/src/nsMIMEInputStream.h
netwerk/base/src/nsMediaFragmentURIParser.cpp
netwerk/base/src/nsMediaFragmentURIParser.h
netwerk/base/src/nsNativeConnectionHelper.cpp
netwerk/base/src/nsNativeConnectionHelper.h
netwerk/base/src/nsNetAddr.cpp
netwerk/base/src/nsNetAddr.h
netwerk/base/src/nsNetSegmentUtils.h
netwerk/base/src/nsNetUtil.cpp
netwerk/base/src/nsPACMan.cpp
netwerk/base/src/nsPACMan.h
netwerk/base/src/nsPreloadedStream.cpp
netwerk/base/src/nsPreloadedStream.h
netwerk/base/src/nsProtocolProxyService.cpp
netwerk/base/src/nsProtocolProxyService.h
netwerk/base/src/nsProxyInfo.cpp
netwerk/base/src/nsProxyInfo.h
netwerk/base/src/nsRequestObserverProxy.cpp
netwerk/base/src/nsRequestObserverProxy.h
netwerk/base/src/nsSerializationHelper.cpp
netwerk/base/src/nsSerializationHelper.h
netwerk/base/src/nsServerSocket.cpp
netwerk/base/src/nsServerSocket.h
netwerk/base/src/nsSimpleNestedURI.cpp
netwerk/base/src/nsSimpleNestedURI.h
netwerk/base/src/nsSimpleStreamListener.cpp
netwerk/base/src/nsSimpleStreamListener.h
netwerk/base/src/nsSimpleURI.cpp
netwerk/base/src/nsSimpleURI.h
netwerk/base/src/nsSocketTransport2.cpp
netwerk/base/src/nsSocketTransport2.h
netwerk/base/src/nsSocketTransportService2.cpp
netwerk/base/src/nsSocketTransportService2.h
netwerk/base/src/nsStandardURL.cpp
netwerk/base/src/nsStandardURL.h
netwerk/base/src/nsStreamListenerTee.cpp
netwerk/base/src/nsStreamListenerTee.h
netwerk/base/src/nsStreamListenerWrapper.cpp
netwerk/base/src/nsStreamLoader.cpp
netwerk/base/src/nsStreamLoader.h
netwerk/base/src/nsStreamTransportService.cpp
netwerk/base/src/nsStreamTransportService.h
netwerk/base/src/nsSyncStreamListener.cpp
netwerk/base/src/nsSyncStreamListener.h
netwerk/base/src/nsTemporaryFileInputStream.cpp
netwerk/base/src/nsTemporaryFileInputStream.h
netwerk/base/src/nsTransportUtils.cpp
netwerk/base/src/nsTransportUtils.h
netwerk/base/src/nsUDPSocket.cpp
netwerk/base/src/nsUDPSocket.h
netwerk/base/src/nsURIChecker.cpp
netwerk/base/src/nsURIChecker.h
netwerk/base/src/nsURLHelper.cpp
netwerk/base/src/nsURLHelper.h
netwerk/base/src/nsURLHelperOSX.cpp
netwerk/base/src/nsURLHelperUnix.cpp
netwerk/base/src/nsURLHelperWin.cpp
netwerk/base/src/nsURLParsers.cpp
netwerk/base/src/nsURLParsers.h
netwerk/base/src/nsUnicharStreamLoader.cpp
netwerk/base/src/nsUnicharStreamLoader.h
netwerk/build/moz.build
netwerk/cache/moz.build
netwerk/cache2/moz.build
netwerk/dns/moz.build
netwerk/ipc/moz.build
netwerk/protocol/about/moz.build
netwerk/protocol/app/moz.build
netwerk/protocol/data/moz.build
netwerk/protocol/device/moz.build
netwerk/protocol/file/moz.build
netwerk/protocol/ftp/moz.build
netwerk/protocol/http/moz.build
netwerk/protocol/http/nsHttpHandler.h
netwerk/protocol/res/moz.build
netwerk/protocol/rtsp/moz.build
netwerk/protocol/viewsource/moz.build
netwerk/protocol/websocket/moz.build
netwerk/protocol/wyciwyg/moz.build
netwerk/sctp/src/moz.build
netwerk/streamconv/converters/moz.build
netwerk/system/android/moz.build
netwerk/system/qt/moz.build
toolkit/components/url-classifier/nsCheckSummedOutputStream.h
uriloader/exthandler/moz.build
widget/android/moz.build
--- a/chrome/moz.build
+++ b/chrome/moz.build
@@ -30,17 +30,17 @@ include('/ipc/chromium/chromium-config.m
 
 FINAL_LIBRARY = 'xul'
 
 GENERATED_INCLUDES += [
     '/xpcom',
 ]
 
 LOCAL_INCLUDES += [
-    '/netwerk/base/src',
+    '/netwerk/base',
     '/netwerk/protocol/res',
     '/xpcom/components'
 ]
 
 if CONFIG['MOZ_ENABLE_GTK']:
     CXXFLAGS += CONFIG['TK_CFLAGS']
 
 FAIL_ON_WARNINGS = True
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -406,17 +406,17 @@ LOCAL_INCLUDES += [
     '/js/ipc',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
     '/layout/base',
     '/layout/generic',
     '/layout/style',
     '/layout/svg',
     '/layout/xul',
-    '/netwerk/base/src',
+    '/netwerk/base',
     '/widget',
     '/xpcom/ds',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     LOCAL_INCLUDES += [
         '../fmradio',
         '../system/gonk',
--- a/dom/html/moz.build
+++ b/dom/html/moz.build
@@ -236,12 +236,12 @@ LOCAL_INCLUDES += [
     '/dom/xul',
     '/editor/libeditor',
     '/editor/txmgr',
     '/layout/forms',
     '/layout/generic',
     '/layout/style',
     '/layout/tables',
     '/layout/xul',
-    '/netwerk/base/src',
+    '/netwerk/base',
 ]
 
 FINAL_LIBRARY = 'xul'
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -127,17 +127,17 @@ LOCAL_INCLUDES += [
     '/dom/workers',
     '/editor/libeditor',
     '/embedding/components/printingui/ipc',
     '/extensions/cookie',
     '/extensions/spellcheck/src',
     '/hal/sandbox',
     '/js/ipc',
     '/layout/base',
-    '/netwerk/base/src',
+    '/netwerk/base',
     '/toolkit/xre',
     '/uriloader/exthandler',
     '/widget',
     '/xpcom/base',
     '/xpcom/threads',
 ]
 
 DEFINES['BIN_SUFFIX'] = '"%s"' % CONFIG['BIN_SUFFIX']
--- a/dom/jsurl/moz.build
+++ b/dom/jsurl/moz.build
@@ -11,14 +11,14 @@ EXPORTS += [
 UNIFIED_SOURCES += [
     'nsJSProtocolHandler.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     "/dom/base",
-    "/netwerk/base/src",
+    "/netwerk/base",
 ]
 
 FINAL_LIBRARY = 'xul'
 
 MOCHITEST_MANIFESTS += ['test/mochitest.ini']
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -246,17 +246,17 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/caps',
     '/dom/base',
     '/dom/camera',
     '/layout/generic',
     '/layout/xul',
-    '/netwerk/base/src',
+    '/netwerk/base',
 ]
 
 if CONFIG['MOZ_DIRECTSHOW']:
     LOCAL_INCLUDES += [
         '/media/webrtc/trunk/webrtc/modules/video_capture/windows',
     ]
 
 if CONFIG['MOZ_WEBRTC']:
--- a/dom/security/moz.build
+++ b/dom/security/moz.build
@@ -26,10 +26,10 @@ UNIFIED_SOURCES += [
     'nsMixedContentBlocker.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/caps',
-    '/netwerk/base/src',
+    '/netwerk/base',
 ]
--- a/image/src/moz.build
+++ b/image/src/moz.build
@@ -61,13 +61,13 @@ LOCAL_INCLUDES += [
     '/dom/svg',
     # Access to Skia headers for Downscaler
     '/gfx/2d',
     # We need to instantiate the decoders
     '/image/decoders',
     # Because VectorImage.cpp includes nsSVGUtils.h and nsSVGEffects.h
     '/layout/svg',
     # For URI-related functionality
-    '/netwerk/base/src',
+    '/netwerk/base',
 ]
 
 # Because imgFrame.cpp includes "cairo.h"
 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -62,17 +62,17 @@ LOCAL_INCLUDES += [
     '/dom/xul/templates',
     '/editor/composer',
     '/editor/libeditor',
     '/editor/txmgr',
     '/editor/txtsvc',
     '/extensions/cookie',
     '/js/xpconnect/loader',
     '/js/xpconnect/src',
-    '/netwerk/base/src',
+    '/netwerk/base',
     '/netwerk/cookie',
     '/view',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     LOCAL_INCLUDES += [
         '/dom/system/windows',
     ]
--- a/mobile/android/base/GeckoAppShell.java
+++ b/mobile/android/base/GeckoAppShell.java
@@ -235,17 +235,17 @@ public class GeckoAppShell
      * http://mxr.mozilla.org/mozilla-central/source/uriloader/base/nsIWebProgressListener.idl
     */
     static public final int WPL_STATE_START = 0x00000001;
     static public final int WPL_STATE_STOP = 0x00000010;
     static public final int WPL_STATE_IS_DOCUMENT = 0x00020000;
     static public final int WPL_STATE_IS_NETWORK = 0x00040000;
 
     /* Keep in sync with constants found here:
-      http://mxr.mozilla.org/mozilla-central/source/netwerk/base/public/nsINetworkLinkService.idl
+      http://mxr.mozilla.org/mozilla-central/source/netwerk/base/nsINetworkLinkService.idl
     */
     static public final int LINK_TYPE_UNKNOWN = 0;
     static public final int LINK_TYPE_ETHERNET = 1;
     static public final int LINK_TYPE_USB = 2;
     static public final int LINK_TYPE_WIFI = 3;
     static public final int LINK_TYPE_WIMAX = 4;
     static public final int LINK_TYPE_2G = 5;
     static public final int LINK_TYPE_3G = 6;
--- a/mobile/android/base/GeckoConnectivityReceiver.java
+++ b/mobile/android/base/GeckoConnectivityReceiver.java
@@ -11,17 +11,17 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.util.Log;
 
 public class GeckoConnectivityReceiver extends BroadcastReceiver {
     /*
      * Keep the below constants in sync with
-     * http://mxr.mozilla.org/mozilla-central/source/netwerk/base/public/nsINetworkLinkService.idl
+     * http://mxr.mozilla.org/mozilla-central/source/netwerk/base/nsINetworkLinkService.idl
      */
     private static final String LINK_DATA_UP = "up";
     private static final String LINK_DATA_DOWN = "down";
     private static final String LINK_DATA_CHANGED = "changed";
     private static final String LINK_DATA_UNKNOWN = "unknown";
 
     private static final String LOGTAG = "GeckoConnectivityReceiver";
 
--- a/modules/libpref/Makefile.in
+++ b/modules/libpref/Makefile.in
@@ -7,17 +7,17 @@ include $(topsrcdir)/config/rules.mk
 
 GARBAGE		+= $(addprefix $(DIST)/bin/defaults/pref/, \
 			mailnews.js editor.js \
 			aix.js unix.js winpref.js)
 
 GARBAGE		+= greprefs.js
 
 # TODO bug 813259 external files should be defined near their location in the source tree.
-grepref_files = $(topsrcdir)/netwerk/base/public/security-prefs.js $(srcdir)/init/all.js
+grepref_files = $(topsrcdir)/netwerk/base/security-prefs.js $(srcdir)/init/all.js
 
 ifdef MOZ_DATA_REPORTING
 grepref_files += $(topsrcdir)/services/datareporting/datareporting-prefs.js
 endif
 
 ifdef MOZ_SERVICES_HEALTHREPORT
 ifneq (android,$(MOZ_WIDGET_TOOLKIT))
 grepref_files += $(topsrcdir)/services/healthreport/healthreport-prefs.js
rename from netwerk/base/src/ADivertableParentChannel.h
rename to netwerk/base/ADivertableParentChannel.h
rename from netwerk/base/src/ArrayBufferInputStream.cpp
rename to netwerk/base/ArrayBufferInputStream.cpp
rename from netwerk/base/src/ArrayBufferInputStream.h
rename to netwerk/base/ArrayBufferInputStream.h
rename from netwerk/base/src/AutoClose.h
rename to netwerk/base/AutoClose.h
rename from netwerk/base/src/BackgroundFileSaver.cpp
rename to netwerk/base/BackgroundFileSaver.cpp
rename from netwerk/base/src/BackgroundFileSaver.h
rename to netwerk/base/BackgroundFileSaver.h
rename from netwerk/base/src/ChannelDiverterChild.cpp
rename to netwerk/base/ChannelDiverterChild.cpp
rename from netwerk/base/src/ChannelDiverterChild.h
rename to netwerk/base/ChannelDiverterChild.h
rename from netwerk/base/src/ChannelDiverterParent.cpp
rename to netwerk/base/ChannelDiverterParent.cpp
rename from netwerk/base/src/ChannelDiverterParent.h
rename to netwerk/base/ChannelDiverterParent.h
rename from netwerk/base/src/Dashboard.cpp
rename to netwerk/base/Dashboard.cpp
rename from netwerk/base/src/Dashboard.h
rename to netwerk/base/Dashboard.h
rename from netwerk/base/src/DashboardTypes.h
rename to netwerk/base/DashboardTypes.h
rename from netwerk/base/src/EventTokenBucket.cpp
rename to netwerk/base/EventTokenBucket.cpp
rename from netwerk/base/src/EventTokenBucket.h
rename to netwerk/base/EventTokenBucket.h
rename from netwerk/base/src/LoadContextInfo.cpp
rename to netwerk/base/LoadContextInfo.cpp
rename from netwerk/base/src/LoadContextInfo.h
rename to netwerk/base/LoadContextInfo.h
rename from netwerk/base/public/NetStatistics.h
rename to netwerk/base/NetStatistics.h
rename from netwerk/base/src/NetUtil.jsm
rename to netwerk/base/NetUtil.jsm
rename from netwerk/base/src/NetworkActivityMonitor.cpp
rename to netwerk/base/NetworkActivityMonitor.cpp
rename from netwerk/base/src/NetworkActivityMonitor.h
rename to netwerk/base/NetworkActivityMonitor.h
rename from netwerk/base/src/OfflineObserver.cpp
rename to netwerk/base/OfflineObserver.cpp
rename from netwerk/base/src/OfflineObserver.h
rename to netwerk/base/OfflineObserver.h
rename from netwerk/base/src/Predictor.cpp
rename to netwerk/base/Predictor.cpp
rename from netwerk/base/src/Predictor.h
rename to netwerk/base/Predictor.h
rename from netwerk/base/src/PrivateBrowsingChannel.h
rename to netwerk/base/PrivateBrowsingChannel.h
rename from netwerk/base/src/ProxyAutoConfig.cpp
rename to netwerk/base/ProxyAutoConfig.cpp
rename from netwerk/base/src/ProxyAutoConfig.h
rename to netwerk/base/ProxyAutoConfig.h
rename from netwerk/base/src/RedirectChannelRegistrar.cpp
rename to netwerk/base/RedirectChannelRegistrar.cpp
rename from netwerk/base/src/RedirectChannelRegistrar.h
rename to netwerk/base/RedirectChannelRegistrar.h
rename from netwerk/base/public/ReferrerPolicy.h
rename to netwerk/base/ReferrerPolicy.h
rename from netwerk/base/src/StreamingProtocolService.cpp
rename to netwerk/base/StreamingProtocolService.cpp
rename from netwerk/base/src/StreamingProtocolService.h
rename to netwerk/base/StreamingProtocolService.h
rename from netwerk/base/src/TLSServerSocket.cpp
rename to netwerk/base/TLSServerSocket.cpp
rename from netwerk/base/src/TLSServerSocket.h
rename to netwerk/base/TLSServerSocket.h
rename from netwerk/base/src/Tickler.cpp
rename to netwerk/base/Tickler.cpp
rename from netwerk/base/src/Tickler.h
rename to netwerk/base/Tickler.h
--- a/netwerk/base/moz.build
+++ b/netwerk/base/moz.build
@@ -1,7 +1,284 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
-DIRS += ['public', 'src']
+XPIDL_SOURCES += [
+    'mozIThirdPartyUtil.idl',
+    'nsIApplicationCache.idl',
+    'nsIApplicationCacheChannel.idl',
+    'nsIApplicationCacheContainer.idl',
+    'nsIApplicationCacheService.idl',
+    'nsIArrayBufferInputStream.idl',
+    'nsIAsyncStreamCopier.idl',
+    'nsIAsyncStreamCopier2.idl',
+    'nsIAsyncVerifyRedirectCallback.idl',
+    'nsIAuthInformation.idl',
+    'nsIAuthModule.idl',
+    'nsIAuthPrompt.idl',
+    'nsIAuthPrompt2.idl',
+    'nsIAuthPromptAdapterFactory.idl',
+    'nsIAuthPromptCallback.idl',
+    'nsIAuthPromptProvider.idl',
+    'nsIBackgroundFileSaver.idl',
+    'nsIBufferedStreams.idl',
+    'nsIByteRangeRequest.idl',
+    'nsICacheInfoChannel.idl',
+    'nsICachingChannel.idl',
+    'nsICancelable.idl',
+    'nsIChannel.idl',
+    'nsIChannelEventSink.idl',
+    'nsIChildChannel.idl',
+    'nsIClassOfService.idl',
+    'nsIContentSniffer.idl',
+    'nsICryptoFIPSInfo.idl',
+    'nsICryptoHash.idl',
+    'nsICryptoHMAC.idl',
+    'nsIDashboard.idl',
+    'nsIDashboardEventNotifier.idl',
+    'nsIDivertableChannel.idl',
+    'nsIDownloader.idl',
+    'nsIEncodedChannel.idl',
+    'nsIExternalProtocolHandler.idl',
+    'nsIFileStreams.idl',
+    'nsIFileURL.idl',
+    'nsIForcePendingChannel.idl',
+    'nsIHttpPushListener.idl',
+    'nsIIncrementalDownload.idl',
+    'nsIInputStreamChannel.idl',
+    'nsIInputStreamPump.idl',
+    'nsIIOService.idl',
+    'nsIIOService2.idl',
+    'nsILoadContextInfo.idl',
+    'nsILoadGroup.idl',
+    'nsILoadGroupChild.idl',
+    'nsIMIMEInputStream.idl',
+    'nsIMultiPartChannel.idl',
+    'nsINestedURI.idl',
+    'nsINetAddr.idl',
+    'nsINetUtil.idl',
+    'nsINetworkInterceptController.idl',
+    'nsINetworkLinkService.idl',
+    'nsINetworkPredictor.idl',
+    'nsINetworkPredictorVerifier.idl',
+    'nsINetworkProperties.idl',
+    'nsINSSErrorsService.idl',
+    'nsINullChannel.idl',
+    'nsIParentChannel.idl',
+    'nsIParentRedirectingChannel.idl',
+    'nsIPermission.idl',
+    'nsIPermissionManager.idl',
+    'nsIPrivateBrowsingChannel.idl',
+    'nsIProgressEventSink.idl',
+    'nsIPrompt.idl',
+    'nsIProtocolHandler.idl',
+    'nsIProtocolProxyCallback.idl',
+    'nsIProtocolProxyFilter.idl',
+    'nsIProtocolProxyService.idl',
+    'nsIProtocolProxyService2.idl',
+    'nsIProxiedChannel.idl',
+    'nsIProxiedProtocolHandler.idl',
+    'nsIProxyInfo.idl',
+    'nsIRandomGenerator.idl',
+    'nsIRedirectChannelRegistrar.idl',
+    'nsIRedirectHistory.idl',
+    'nsIRedirectResultListener.idl',
+    'nsIRequest.idl',
+    'nsIRequestObserver.idl',
+    'nsIRequestObserverProxy.idl',
+    'nsIResumableChannel.idl',
+    'nsISecretDecoderRing.idl',
+    'nsISecureBrowserUI.idl',
+    'nsISecurityEventSink.idl',
+    'nsISecurityInfoProvider.idl',
+    'nsISerializationHelper.idl',
+    'nsIServerSocket.idl',
+    'nsISimpleStreamListener.idl',
+    'nsISiteSecurityService.idl',
+    'nsISocketTransport.idl',
+    'nsISocketTransportService.idl',
+    'nsISpeculativeConnect.idl',
+    'nsIStandardURL.idl',
+    'nsIStreamingProtocolController.idl',
+    'nsIStreamingProtocolService.idl',
+    'nsIStreamListener.idl',
+    'nsIStreamListenerTee.idl',
+    'nsIStreamLoader.idl',
+    'nsIStreamTransportService.idl',
+    'nsISyncStreamListener.idl',
+    'nsISystemProxySettings.idl',
+    'nsIThreadRetargetableRequest.idl',
+    'nsIThreadRetargetableStreamListener.idl',
+    'nsITimedChannel.idl',
+    'nsITLSServerSocket.idl',
+    'nsITraceableChannel.idl',
+    'nsITransport.idl',
+    'nsIUDPSocket.idl',
+    'nsIUDPSocketFilter.idl',
+    'nsIUnicharStreamLoader.idl',
+    'nsIUploadChannel.idl',
+    'nsIUploadChannel2.idl',
+    'nsIURI.idl',
+    'nsIURIChecker.idl',
+    'nsIURIClassifier.idl',
+    'nsIURIWithPrincipal.idl',
+    'nsIURL.idl',
+    'nsIURLParser.idl',
+    'nsPILoadGroupInternal.idl',
+    'nsPISocketTransportService.idl',
+]
+
+if CONFIG['MOZ_TOOLKIT_SEARCH']:
+    XPIDL_SOURCES += [
+        'nsIBrowserSearchService.idl',
+    ]
+
+XPIDL_MODULE = 'necko'
+
+EXPORTS += [
+    'netCore.h',
+    'nsASocketHandler.h',
+    'nsAsyncRedirectVerifyHelper.h',
+    'nsFileStreams.h',
+    'nsMIMEInputStream.h',
+    'nsNetUtil.h',
+    'nsReadLine.h',
+    'nsStreamListenerWrapper.h',
+    'nsTemporaryFileInputStream.h',
+    'nsURIHashKey.h',
+    'nsURLHelper.h',
+    'nsURLParsers.h',
+]
+
+EXPORTS.mozilla.net += [
+    'ChannelDiverterChild.h',
+    'ChannelDiverterParent.h',
+    'Dashboard.h',
+    'DashboardTypes.h',
+    'OfflineObserver.h',
+    'ReferrerPolicy.h',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+    EXPORTS += [
+        'NetStatistics.h',
+    ]
+
+UNIFIED_SOURCES += [
+    'ArrayBufferInputStream.cpp',
+    'BackgroundFileSaver.cpp',
+    'ChannelDiverterChild.cpp',
+    'ChannelDiverterParent.cpp',
+    'Dashboard.cpp',
+    'EventTokenBucket.cpp',
+    'LoadContextInfo.cpp',
+    'NetworkActivityMonitor.cpp',
+    'nsAsyncRedirectVerifyHelper.cpp',
+    'nsAsyncStreamCopier.cpp',
+    'nsAuthInformationHolder.cpp',
+    'nsBase64Encoder.cpp',
+    'nsBaseChannel.cpp',
+    'nsBaseContentStream.cpp',
+    'nsBufferedStreams.cpp',
+    'nsChannelClassifier.cpp',
+    'nsDirectoryIndexStream.cpp',
+    'nsDNSPrefetch.cpp',
+    'nsDownloader.cpp',
+    'nsFileStreams.cpp',
+    'nsIncrementalDownload.cpp',
+    'nsInputStreamChannel.cpp',
+    'nsInputStreamPump.cpp',
+    'nsIOService.cpp',
+    'nsLoadGroup.cpp',
+    'nsMediaFragmentURIParser.cpp',
+    'nsMIMEInputStream.cpp',
+    'nsNetAddr.cpp',
+    'nsNetUtil.cpp',
+    'nsPACMan.cpp',
+    'nsPreloadedStream.cpp',
+    'nsProtocolProxyService.cpp',
+    'nsProxyInfo.cpp',
+    'nsRequestObserverProxy.cpp',
+    'nsSerializationHelper.cpp',
+    'nsServerSocket.cpp',
+    'nsSimpleNestedURI.cpp',
+    'nsSimpleStreamListener.cpp',
+    'nsSimpleURI.cpp',
+    'nsSocketTransport2.cpp',
+    'nsSocketTransportService2.cpp',
+    'nsStandardURL.cpp',
+    'nsStreamListenerTee.cpp',
+    'nsStreamListenerWrapper.cpp',
+    'nsStreamLoader.cpp',
+    'nsStreamTransportService.cpp',
+    'nsSyncStreamListener.cpp',
+    'nsTemporaryFileInputStream.cpp',
+    'nsTransportUtils.cpp',
+    'nsUDPSocket.cpp',
+    'nsUnicharStreamLoader.cpp',
+    'nsURIChecker.cpp',
+    'nsURLHelper.cpp',
+    'nsURLParsers.cpp',
+    'OfflineObserver.cpp',
+    'Predictor.cpp',
+    'ProxyAutoConfig.cpp',
+    'RedirectChannelRegistrar.cpp',
+    'StreamingProtocolService.cpp',
+    'Tickler.cpp',
+    'TLSServerSocket.cpp',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    SOURCES += [
+        'nsAutodialWin.cpp',
+        'nsNativeConnectionHelper.cpp',
+        'nsURLHelperWin.cpp',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    SOURCES += [
+        'nsURLHelperOSX.cpp',
+    ]
+else:
+    SOURCES += [
+        'nsURLHelperUnix.cpp',
+    ]
+
+if CONFIG['MOZ_ENABLE_QTNETWORK']:
+    SOURCES += [
+        'nsAutodialQt.cpp',
+    ]
+
+EXTRA_JS_MODULES += [
+    'NetUtil.jsm',
+]
+
+FAIL_ON_WARNINGS = True
+
+MSVC_ENABLE_PGO = True
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    '/dom/base',
+    '/netwerk/protocol/http'
+]
+
+if 'rtsp' in CONFIG['NECKO_PROTOCOLS']:
+    LOCAL_INCLUDES += [
+        '/netwerk/protocol/rtsp/controller',
+        '/netwerk/protocol/rtsp/rtsp',
+    ]
+
+if CONFIG['MOZ_ENABLE_QTNETWORK']:
+    LOCAL_INCLUDES += [
+        '/netwerk/system/qt',
+    ]
+
+if CONFIG['ENABLE_TESTS']:
+    DEFINES['PREDICTOR_TESTS'] = True
+
+if CONFIG['MOZ_ENABLE_QTNETWORK']:
+    CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']
rename from netwerk/base/public/mozIThirdPartyUtil.idl
rename to netwerk/base/mozIThirdPartyUtil.idl
rename from netwerk/base/public/netCore.h
rename to netwerk/base/netCore.h
rename from netwerk/base/public/nsASocketHandler.h
rename to netwerk/base/nsASocketHandler.h
rename from netwerk/base/src/nsAsyncRedirectVerifyHelper.cpp
rename to netwerk/base/nsAsyncRedirectVerifyHelper.cpp
rename from netwerk/base/public/nsAsyncRedirectVerifyHelper.h
rename to netwerk/base/nsAsyncRedirectVerifyHelper.h
rename from netwerk/base/src/nsAsyncStreamCopier.cpp
rename to netwerk/base/nsAsyncStreamCopier.cpp
rename from netwerk/base/src/nsAsyncStreamCopier.h
rename to netwerk/base/nsAsyncStreamCopier.h
rename from netwerk/base/src/nsAuthInformationHolder.cpp
rename to netwerk/base/nsAuthInformationHolder.cpp
rename from netwerk/base/src/nsAuthInformationHolder.h
rename to netwerk/base/nsAuthInformationHolder.h
rename from netwerk/base/src/nsAutodialQt.cpp
rename to netwerk/base/nsAutodialQt.cpp
rename from netwerk/base/src/nsAutodialQt.h
rename to netwerk/base/nsAutodialQt.h
rename from netwerk/base/src/nsAutodialWin.cpp
rename to netwerk/base/nsAutodialWin.cpp
rename from netwerk/base/src/nsAutodialWin.h
rename to netwerk/base/nsAutodialWin.h
rename from netwerk/base/src/nsBase64Encoder.cpp
rename to netwerk/base/nsBase64Encoder.cpp
rename from netwerk/base/src/nsBase64Encoder.h
rename to netwerk/base/nsBase64Encoder.h
rename from netwerk/base/src/nsBaseChannel.cpp
rename to netwerk/base/nsBaseChannel.cpp
rename from netwerk/base/src/nsBaseChannel.h
rename to netwerk/base/nsBaseChannel.h
rename from netwerk/base/src/nsBaseContentStream.cpp
rename to netwerk/base/nsBaseContentStream.cpp
rename from netwerk/base/src/nsBaseContentStream.h
rename to netwerk/base/nsBaseContentStream.h
rename from netwerk/base/src/nsBufferedStreams.cpp
rename to netwerk/base/nsBufferedStreams.cpp
rename from netwerk/base/src/nsBufferedStreams.h
rename to netwerk/base/nsBufferedStreams.h
rename from netwerk/base/src/nsChannelClassifier.cpp
rename to netwerk/base/nsChannelClassifier.cpp
rename from netwerk/base/src/nsChannelClassifier.h
rename to netwerk/base/nsChannelClassifier.h
rename from netwerk/base/src/nsDNSPrefetch.cpp
rename to netwerk/base/nsDNSPrefetch.cpp
rename from netwerk/base/src/nsDNSPrefetch.h
rename to netwerk/base/nsDNSPrefetch.h
rename from netwerk/base/src/nsDirectoryIndexStream.cpp
rename to netwerk/base/nsDirectoryIndexStream.cpp
rename from netwerk/base/src/nsDirectoryIndexStream.h
rename to netwerk/base/nsDirectoryIndexStream.h
rename from netwerk/base/src/nsDownloader.cpp
rename to netwerk/base/nsDownloader.cpp
rename from netwerk/base/src/nsDownloader.h
rename to netwerk/base/nsDownloader.h
rename from netwerk/base/src/nsFileStreams.cpp
rename to netwerk/base/nsFileStreams.cpp
rename from netwerk/base/src/nsFileStreams.h
rename to netwerk/base/nsFileStreams.h
rename from netwerk/base/public/nsIApplicationCache.idl
rename to netwerk/base/nsIApplicationCache.idl
rename from netwerk/base/public/nsIApplicationCacheChannel.idl
rename to netwerk/base/nsIApplicationCacheChannel.idl
rename from netwerk/base/public/nsIApplicationCacheContainer.idl
rename to netwerk/base/nsIApplicationCacheContainer.idl
rename from netwerk/base/public/nsIApplicationCacheService.idl
rename to netwerk/base/nsIApplicationCacheService.idl
rename from netwerk/base/public/nsIArrayBufferInputStream.idl
rename to netwerk/base/nsIArrayBufferInputStream.idl
rename from netwerk/base/public/nsIAsyncStreamCopier.idl
rename to netwerk/base/nsIAsyncStreamCopier.idl
rename from netwerk/base/public/nsIAsyncStreamCopier2.idl
rename to netwerk/base/nsIAsyncStreamCopier2.idl
rename from netwerk/base/public/nsIAsyncVerifyRedirectCallback.idl
rename to netwerk/base/nsIAsyncVerifyRedirectCallback.idl
rename from netwerk/base/public/nsIAuthInformation.idl
rename to netwerk/base/nsIAuthInformation.idl
rename from netwerk/base/public/nsIAuthModule.idl
rename to netwerk/base/nsIAuthModule.idl
rename from netwerk/base/public/nsIAuthPrompt.idl
rename to netwerk/base/nsIAuthPrompt.idl
rename from netwerk/base/public/nsIAuthPrompt2.idl
rename to netwerk/base/nsIAuthPrompt2.idl
rename from netwerk/base/public/nsIAuthPromptAdapterFactory.idl
rename to netwerk/base/nsIAuthPromptAdapterFactory.idl
rename from netwerk/base/public/nsIAuthPromptCallback.idl
rename to netwerk/base/nsIAuthPromptCallback.idl
rename from netwerk/base/public/nsIAuthPromptProvider.idl
rename to netwerk/base/nsIAuthPromptProvider.idl
rename from netwerk/base/public/nsIBackgroundFileSaver.idl
rename to netwerk/base/nsIBackgroundFileSaver.idl
rename from netwerk/base/public/nsIBrowserSearchService.idl
rename to netwerk/base/nsIBrowserSearchService.idl
rename from netwerk/base/public/nsIBufferedStreams.idl
rename to netwerk/base/nsIBufferedStreams.idl
rename from netwerk/base/public/nsIByteRangeRequest.idl
rename to netwerk/base/nsIByteRangeRequest.idl
rename from netwerk/base/public/nsICacheInfoChannel.idl
rename to netwerk/base/nsICacheInfoChannel.idl
rename from netwerk/base/public/nsICachingChannel.idl
rename to netwerk/base/nsICachingChannel.idl
rename from netwerk/base/public/nsICancelable.idl
rename to netwerk/base/nsICancelable.idl
rename from netwerk/base/public/nsIChannel.idl
rename to netwerk/base/nsIChannel.idl
rename from netwerk/base/public/nsIChannelEventSink.idl
rename to netwerk/base/nsIChannelEventSink.idl
rename from netwerk/base/public/nsIChildChannel.idl
rename to netwerk/base/nsIChildChannel.idl
rename from netwerk/base/public/nsIClassOfService.idl
rename to netwerk/base/nsIClassOfService.idl
rename from netwerk/base/public/nsIContentSniffer.idl
rename to netwerk/base/nsIContentSniffer.idl
rename from netwerk/base/public/nsICryptoFIPSInfo.idl
rename to netwerk/base/nsICryptoFIPSInfo.idl
rename from netwerk/base/public/nsICryptoHMAC.idl
rename to netwerk/base/nsICryptoHMAC.idl
rename from netwerk/base/public/nsICryptoHash.idl
rename to netwerk/base/nsICryptoHash.idl
rename from netwerk/base/public/nsIDashboard.idl
rename to netwerk/base/nsIDashboard.idl
rename from netwerk/base/public/nsIDashboardEventNotifier.idl
rename to netwerk/base/nsIDashboardEventNotifier.idl
rename from netwerk/base/public/nsIDivertableChannel.idl
rename to netwerk/base/nsIDivertableChannel.idl
rename from netwerk/base/public/nsIDownloader.idl
rename to netwerk/base/nsIDownloader.idl
rename from netwerk/base/public/nsIEncodedChannel.idl
rename to netwerk/base/nsIEncodedChannel.idl
rename from netwerk/base/public/nsIExternalProtocolHandler.idl
rename to netwerk/base/nsIExternalProtocolHandler.idl
rename from netwerk/base/public/nsIFileStreams.idl
rename to netwerk/base/nsIFileStreams.idl
rename from netwerk/base/public/nsIFileURL.idl
rename to netwerk/base/nsIFileURL.idl
rename from netwerk/base/public/nsIForcePendingChannel.idl
rename to netwerk/base/nsIForcePendingChannel.idl
rename from netwerk/base/public/nsIHttpPushListener.idl
rename to netwerk/base/nsIHttpPushListener.idl
rename from netwerk/base/public/nsIIOService.idl
rename to netwerk/base/nsIIOService.idl
rename from netwerk/base/public/nsIIOService2.idl
rename to netwerk/base/nsIIOService2.idl
rename from netwerk/base/public/nsIIncrementalDownload.idl
rename to netwerk/base/nsIIncrementalDownload.idl
rename from netwerk/base/public/nsIInputStreamChannel.idl
rename to netwerk/base/nsIInputStreamChannel.idl
rename from netwerk/base/public/nsIInputStreamPump.idl
rename to netwerk/base/nsIInputStreamPump.idl
rename from netwerk/base/public/nsILoadContextInfo.idl
rename to netwerk/base/nsILoadContextInfo.idl
rename from netwerk/base/public/nsILoadGroup.idl
rename to netwerk/base/nsILoadGroup.idl
rename from netwerk/base/public/nsILoadGroupChild.idl
rename to netwerk/base/nsILoadGroupChild.idl
rename from netwerk/base/public/nsIMIMEInputStream.idl
rename to netwerk/base/nsIMIMEInputStream.idl
rename from netwerk/base/public/nsIMultiPartChannel.idl
rename to netwerk/base/nsIMultiPartChannel.idl
rename from netwerk/base/public/nsINSSErrorsService.idl
rename to netwerk/base/nsINSSErrorsService.idl
rename from netwerk/base/public/nsINestedURI.idl
rename to netwerk/base/nsINestedURI.idl
rename from netwerk/base/public/nsINetAddr.idl
rename to netwerk/base/nsINetAddr.idl
rename from netwerk/base/public/nsINetUtil.idl
rename to netwerk/base/nsINetUtil.idl
rename from netwerk/base/public/nsINetworkInterceptController.idl
rename to netwerk/base/nsINetworkInterceptController.idl
rename from netwerk/base/public/nsINetworkLinkService.idl
rename to netwerk/base/nsINetworkLinkService.idl
rename from netwerk/base/public/nsINetworkPredictor.idl
rename to netwerk/base/nsINetworkPredictor.idl
rename from netwerk/base/public/nsINetworkPredictorVerifier.idl
rename to netwerk/base/nsINetworkPredictorVerifier.idl
rename from netwerk/base/public/nsINetworkProperties.idl
rename to netwerk/base/nsINetworkProperties.idl
rename from netwerk/base/public/nsINullChannel.idl
rename to netwerk/base/nsINullChannel.idl
rename from netwerk/base/src/nsIOService.cpp
rename to netwerk/base/nsIOService.cpp
rename from netwerk/base/src/nsIOService.h
rename to netwerk/base/nsIOService.h
rename from netwerk/base/public/nsIParentChannel.idl
rename to netwerk/base/nsIParentChannel.idl
rename from netwerk/base/public/nsIParentRedirectingChannel.idl
rename to netwerk/base/nsIParentRedirectingChannel.idl
rename from netwerk/base/public/nsIPermission.idl
rename to netwerk/base/nsIPermission.idl
rename from netwerk/base/public/nsIPermissionManager.idl
rename to netwerk/base/nsIPermissionManager.idl
rename from netwerk/base/public/nsIPrivateBrowsingChannel.idl
rename to netwerk/base/nsIPrivateBrowsingChannel.idl
rename from netwerk/base/public/nsIProgressEventSink.idl
rename to netwerk/base/nsIProgressEventSink.idl
rename from netwerk/base/public/nsIPrompt.idl
rename to netwerk/base/nsIPrompt.idl
rename from netwerk/base/public/nsIProtocolHandler.idl
rename to netwerk/base/nsIProtocolHandler.idl
rename from netwerk/base/public/nsIProtocolProxyCallback.idl
rename to netwerk/base/nsIProtocolProxyCallback.idl
rename from netwerk/base/public/nsIProtocolProxyFilter.idl
rename to netwerk/base/nsIProtocolProxyFilter.idl
rename from netwerk/base/public/nsIProtocolProxyService.idl
rename to netwerk/base/nsIProtocolProxyService.idl
rename from netwerk/base/public/nsIProtocolProxyService2.idl
rename to netwerk/base/nsIProtocolProxyService2.idl
rename from netwerk/base/public/nsIProxiedChannel.idl
rename to netwerk/base/nsIProxiedChannel.idl
rename from netwerk/base/public/nsIProxiedProtocolHandler.idl
rename to netwerk/base/nsIProxiedProtocolHandler.idl
rename from netwerk/base/public/nsIProxyInfo.idl
rename to netwerk/base/nsIProxyInfo.idl
rename from netwerk/base/public/nsIRandomGenerator.idl
rename to netwerk/base/nsIRandomGenerator.idl
rename from netwerk/base/public/nsIRedirectChannelRegistrar.idl
rename to netwerk/base/nsIRedirectChannelRegistrar.idl
rename from netwerk/base/public/nsIRedirectHistory.idl
rename to netwerk/base/nsIRedirectHistory.idl
rename from netwerk/base/public/nsIRedirectResultListener.idl
rename to netwerk/base/nsIRedirectResultListener.idl
rename from netwerk/base/public/nsIRequest.idl
rename to netwerk/base/nsIRequest.idl
rename from netwerk/base/public/nsIRequestObserver.idl
rename to netwerk/base/nsIRequestObserver.idl
rename from netwerk/base/public/nsIRequestObserverProxy.idl
rename to netwerk/base/nsIRequestObserverProxy.idl
rename from netwerk/base/public/nsIResumableChannel.idl
rename to netwerk/base/nsIResumableChannel.idl
rename from netwerk/base/public/nsISecretDecoderRing.idl
rename to netwerk/base/nsISecretDecoderRing.idl
rename from netwerk/base/public/nsISecureBrowserUI.idl
rename to netwerk/base/nsISecureBrowserUI.idl
rename from netwerk/base/public/nsISecurityEventSink.idl
rename to netwerk/base/nsISecurityEventSink.idl
rename from netwerk/base/public/nsISecurityInfoProvider.idl
rename to netwerk/base/nsISecurityInfoProvider.idl
rename from netwerk/base/public/nsISerializationHelper.idl
rename to netwerk/base/nsISerializationHelper.idl
rename from netwerk/base/public/nsIServerSocket.idl
rename to netwerk/base/nsIServerSocket.idl
rename from netwerk/base/public/nsISimpleStreamListener.idl
rename to netwerk/base/nsISimpleStreamListener.idl
rename from netwerk/base/public/nsISiteSecurityService.idl
rename to netwerk/base/nsISiteSecurityService.idl
rename from netwerk/base/public/nsISocketTransport.idl
rename to netwerk/base/nsISocketTransport.idl
rename from netwerk/base/public/nsISocketTransportService.idl
rename to netwerk/base/nsISocketTransportService.idl
rename from netwerk/base/public/nsISpeculativeConnect.idl
rename to netwerk/base/nsISpeculativeConnect.idl
rename from netwerk/base/public/nsIStandardURL.idl
rename to netwerk/base/nsIStandardURL.idl
rename from netwerk/base/public/nsIStreamListener.idl
rename to netwerk/base/nsIStreamListener.idl
rename from netwerk/base/public/nsIStreamListenerTee.idl
rename to netwerk/base/nsIStreamListenerTee.idl
rename from netwerk/base/public/nsIStreamLoader.idl
rename to netwerk/base/nsIStreamLoader.idl
rename from netwerk/base/public/nsIStreamTransportService.idl
rename to netwerk/base/nsIStreamTransportService.idl
rename from netwerk/base/public/nsIStreamingProtocolController.idl
rename to netwerk/base/nsIStreamingProtocolController.idl
rename from netwerk/base/public/nsIStreamingProtocolService.idl
rename to netwerk/base/nsIStreamingProtocolService.idl
rename from netwerk/base/public/nsISyncStreamListener.idl
rename to netwerk/base/nsISyncStreamListener.idl
rename from netwerk/base/public/nsISystemProxySettings.idl
rename to netwerk/base/nsISystemProxySettings.idl
rename from netwerk/base/public/nsITLSServerSocket.idl
rename to netwerk/base/nsITLSServerSocket.idl
rename from netwerk/base/public/nsIThreadRetargetableRequest.idl
rename to netwerk/base/nsIThreadRetargetableRequest.idl
rename from netwerk/base/public/nsIThreadRetargetableStreamListener.idl
rename to netwerk/base/nsIThreadRetargetableStreamListener.idl
rename from netwerk/base/public/nsITimedChannel.idl
rename to netwerk/base/nsITimedChannel.idl
rename from netwerk/base/public/nsITraceableChannel.idl
rename to netwerk/base/nsITraceableChannel.idl
rename from netwerk/base/public/nsITransport.idl
rename to netwerk/base/nsITransport.idl
rename from netwerk/base/public/nsIUDPSocket.idl
rename to netwerk/base/nsIUDPSocket.idl
rename from netwerk/base/public/nsIUDPSocketFilter.idl
rename to netwerk/base/nsIUDPSocketFilter.idl
rename from netwerk/base/public/nsIURI.idl
rename to netwerk/base/nsIURI.idl
rename from netwerk/base/public/nsIURIChecker.idl
rename to netwerk/base/nsIURIChecker.idl
rename from netwerk/base/public/nsIURIClassifier.idl
rename to netwerk/base/nsIURIClassifier.idl
rename from netwerk/base/public/nsIURIWithPrincipal.idl
rename to netwerk/base/nsIURIWithPrincipal.idl
rename from netwerk/base/public/nsIURL.idl
rename to netwerk/base/nsIURL.idl
rename from netwerk/base/public/nsIURLParser.idl
rename to netwerk/base/nsIURLParser.idl
rename from netwerk/base/public/nsIUnicharStreamLoader.idl
rename to netwerk/base/nsIUnicharStreamLoader.idl
rename from netwerk/base/public/nsIUploadChannel.idl
rename to netwerk/base/nsIUploadChannel.idl
rename from netwerk/base/public/nsIUploadChannel2.idl
rename to netwerk/base/nsIUploadChannel2.idl
rename from netwerk/base/src/nsIncrementalDownload.cpp
rename to netwerk/base/nsIncrementalDownload.cpp
rename from netwerk/base/src/nsInputStreamChannel.cpp
rename to netwerk/base/nsInputStreamChannel.cpp
rename from netwerk/base/src/nsInputStreamChannel.h
rename to netwerk/base/nsInputStreamChannel.h
rename from netwerk/base/src/nsInputStreamPump.cpp
rename to netwerk/base/nsInputStreamPump.cpp
rename from netwerk/base/src/nsInputStreamPump.h
rename to netwerk/base/nsInputStreamPump.h
rename from netwerk/base/src/nsLoadGroup.cpp
rename to netwerk/base/nsLoadGroup.cpp
rename from netwerk/base/src/nsLoadGroup.h
rename to netwerk/base/nsLoadGroup.h
rename from netwerk/base/src/nsMIMEInputStream.cpp
rename to netwerk/base/nsMIMEInputStream.cpp
rename from netwerk/base/src/nsMIMEInputStream.h
rename to netwerk/base/nsMIMEInputStream.h
rename from netwerk/base/src/nsMediaFragmentURIParser.cpp
rename to netwerk/base/nsMediaFragmentURIParser.cpp
rename from netwerk/base/src/nsMediaFragmentURIParser.h
rename to netwerk/base/nsMediaFragmentURIParser.h
rename from netwerk/base/src/nsNativeConnectionHelper.cpp
rename to netwerk/base/nsNativeConnectionHelper.cpp
rename from netwerk/base/src/nsNativeConnectionHelper.h
rename to netwerk/base/nsNativeConnectionHelper.h
rename from netwerk/base/src/nsNetAddr.cpp
rename to netwerk/base/nsNetAddr.cpp
rename from netwerk/base/src/nsNetAddr.h
rename to netwerk/base/nsNetAddr.h
rename from netwerk/base/src/nsNetSegmentUtils.h
rename to netwerk/base/nsNetSegmentUtils.h
rename from netwerk/base/src/nsNetUtil.cpp
rename to netwerk/base/nsNetUtil.cpp
rename from netwerk/base/public/nsNetUtil.h
rename to netwerk/base/nsNetUtil.h
rename from netwerk/base/src/nsPACMan.cpp
rename to netwerk/base/nsPACMan.cpp
rename from netwerk/base/src/nsPACMan.h
rename to netwerk/base/nsPACMan.h
rename from netwerk/base/public/nsPILoadGroupInternal.idl
rename to netwerk/base/nsPILoadGroupInternal.idl
rename from netwerk/base/public/nsPISocketTransportService.idl
rename to netwerk/base/nsPISocketTransportService.idl
rename from netwerk/base/src/nsPreloadedStream.cpp
rename to netwerk/base/nsPreloadedStream.cpp
rename from netwerk/base/src/nsPreloadedStream.h
rename to netwerk/base/nsPreloadedStream.h
rename from netwerk/base/src/nsProtocolProxyService.cpp
rename to netwerk/base/nsProtocolProxyService.cpp
rename from netwerk/base/src/nsProtocolProxyService.h
rename to netwerk/base/nsProtocolProxyService.h
rename from netwerk/base/src/nsProxyInfo.cpp
rename to netwerk/base/nsProxyInfo.cpp
rename from netwerk/base/src/nsProxyInfo.h
rename to netwerk/base/nsProxyInfo.h
rename from netwerk/base/public/nsReadLine.h
rename to netwerk/base/nsReadLine.h
rename from netwerk/base/src/nsRequestObserverProxy.cpp
rename to netwerk/base/nsRequestObserverProxy.cpp
rename from netwerk/base/src/nsRequestObserverProxy.h
rename to netwerk/base/nsRequestObserverProxy.h
rename from netwerk/base/src/nsSerializationHelper.cpp
rename to netwerk/base/nsSerializationHelper.cpp
rename from netwerk/base/src/nsSerializationHelper.h
rename to netwerk/base/nsSerializationHelper.h
rename from netwerk/base/src/nsServerSocket.cpp
rename to netwerk/base/nsServerSocket.cpp
rename from netwerk/base/src/nsServerSocket.h
rename to netwerk/base/nsServerSocket.h
rename from netwerk/base/src/nsSimpleNestedURI.cpp
rename to netwerk/base/nsSimpleNestedURI.cpp
rename from netwerk/base/src/nsSimpleNestedURI.h
rename to netwerk/base/nsSimpleNestedURI.h
rename from netwerk/base/src/nsSimpleStreamListener.cpp
rename to netwerk/base/nsSimpleStreamListener.cpp
rename from netwerk/base/src/nsSimpleStreamListener.h
rename to netwerk/base/nsSimpleStreamListener.h
rename from netwerk/base/src/nsSimpleURI.cpp
rename to netwerk/base/nsSimpleURI.cpp
rename from netwerk/base/src/nsSimpleURI.h
rename to netwerk/base/nsSimpleURI.h
rename from netwerk/base/src/nsSocketTransport2.cpp
rename to netwerk/base/nsSocketTransport2.cpp
rename from netwerk/base/src/nsSocketTransport2.h
rename to netwerk/base/nsSocketTransport2.h
rename from netwerk/base/src/nsSocketTransportService2.cpp
rename to netwerk/base/nsSocketTransportService2.cpp
rename from netwerk/base/src/nsSocketTransportService2.h
rename to netwerk/base/nsSocketTransportService2.h
rename from netwerk/base/src/nsStandardURL.cpp
rename to netwerk/base/nsStandardURL.cpp
rename from netwerk/base/src/nsStandardURL.h
rename to netwerk/base/nsStandardURL.h
rename from netwerk/base/src/nsStreamListenerTee.cpp
rename to netwerk/base/nsStreamListenerTee.cpp
rename from netwerk/base/src/nsStreamListenerTee.h
rename to netwerk/base/nsStreamListenerTee.h
rename from netwerk/base/src/nsStreamListenerWrapper.cpp
rename to netwerk/base/nsStreamListenerWrapper.cpp
rename from netwerk/base/public/nsStreamListenerWrapper.h
rename to netwerk/base/nsStreamListenerWrapper.h
rename from netwerk/base/src/nsStreamLoader.cpp
rename to netwerk/base/nsStreamLoader.cpp
rename from netwerk/base/src/nsStreamLoader.h
rename to netwerk/base/nsStreamLoader.h
rename from netwerk/base/src/nsStreamTransportService.cpp
rename to netwerk/base/nsStreamTransportService.cpp
rename from netwerk/base/src/nsStreamTransportService.h
rename to netwerk/base/nsStreamTransportService.h
rename from netwerk/base/src/nsSyncStreamListener.cpp
rename to netwerk/base/nsSyncStreamListener.cpp
rename from netwerk/base/src/nsSyncStreamListener.h
rename to netwerk/base/nsSyncStreamListener.h
rename from netwerk/base/src/nsTemporaryFileInputStream.cpp
rename to netwerk/base/nsTemporaryFileInputStream.cpp
rename from netwerk/base/src/nsTemporaryFileInputStream.h
rename to netwerk/base/nsTemporaryFileInputStream.h
rename from netwerk/base/src/nsTransportUtils.cpp
rename to netwerk/base/nsTransportUtils.cpp
rename from netwerk/base/src/nsTransportUtils.h
rename to netwerk/base/nsTransportUtils.h
rename from netwerk/base/src/nsUDPSocket.cpp
rename to netwerk/base/nsUDPSocket.cpp
rename from netwerk/base/src/nsUDPSocket.h
rename to netwerk/base/nsUDPSocket.h
rename from netwerk/base/src/nsURIChecker.cpp
rename to netwerk/base/nsURIChecker.cpp
rename from netwerk/base/src/nsURIChecker.h
rename to netwerk/base/nsURIChecker.h
rename from netwerk/base/public/nsURIHashKey.h
rename to netwerk/base/nsURIHashKey.h
rename from netwerk/base/src/nsURLHelper.cpp
rename to netwerk/base/nsURLHelper.cpp
rename from netwerk/base/src/nsURLHelper.h
rename to netwerk/base/nsURLHelper.h
rename from netwerk/base/src/nsURLHelperOSX.cpp
rename to netwerk/base/nsURLHelperOSX.cpp
rename from netwerk/base/src/nsURLHelperUnix.cpp
rename to netwerk/base/nsURLHelperUnix.cpp
rename from netwerk/base/src/nsURLHelperWin.cpp
rename to netwerk/base/nsURLHelperWin.cpp
rename from netwerk/base/src/nsURLParsers.cpp
rename to netwerk/base/nsURLParsers.cpp
rename from netwerk/base/src/nsURLParsers.h
rename to netwerk/base/nsURLParsers.h
rename from netwerk/base/src/nsUnicharStreamLoader.cpp
rename to netwerk/base/nsUnicharStreamLoader.cpp
rename from netwerk/base/src/nsUnicharStreamLoader.h
rename to netwerk/base/nsUnicharStreamLoader.h
deleted file mode 100644
--- a/netwerk/base/public/moz.build
+++ /dev/null
@@ -1,159 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-XPIDL_SOURCES += [
-    'mozIThirdPartyUtil.idl',
-    'nsIApplicationCache.idl',
-    'nsIApplicationCacheChannel.idl',
-    'nsIApplicationCacheContainer.idl',
-    'nsIApplicationCacheService.idl',
-    'nsIArrayBufferInputStream.idl',
-    'nsIAsyncStreamCopier.idl',
-    'nsIAsyncStreamCopier2.idl',
-    'nsIAsyncVerifyRedirectCallback.idl',
-    'nsIAuthInformation.idl',
-    'nsIAuthModule.idl',
-    'nsIAuthPrompt.idl',
-    'nsIAuthPrompt2.idl',
-    'nsIAuthPromptAdapterFactory.idl',
-    'nsIAuthPromptCallback.idl',
-    'nsIAuthPromptProvider.idl',
-    'nsIBackgroundFileSaver.idl',
-    'nsIBufferedStreams.idl',
-    'nsIByteRangeRequest.idl',
-    'nsICacheInfoChannel.idl',
-    'nsICachingChannel.idl',
-    'nsICancelable.idl',
-    'nsIChannel.idl',
-    'nsIChannelEventSink.idl',
-    'nsIChildChannel.idl',
-    'nsIClassOfService.idl',
-    'nsIContentSniffer.idl',
-    'nsICryptoFIPSInfo.idl',
-    'nsICryptoHash.idl',
-    'nsICryptoHMAC.idl',
-    'nsIDashboard.idl',
-    'nsIDashboardEventNotifier.idl',
-    'nsIDivertableChannel.idl',
-    'nsIDownloader.idl',
-    'nsIEncodedChannel.idl',
-    'nsIExternalProtocolHandler.idl',
-    'nsIFileStreams.idl',
-    'nsIFileURL.idl',
-    'nsIForcePendingChannel.idl',
-    'nsIHttpPushListener.idl',
-    'nsIIncrementalDownload.idl',
-    'nsIInputStreamChannel.idl',
-    'nsIInputStreamPump.idl',
-    'nsIIOService.idl',
-    'nsIIOService2.idl',
-    'nsILoadContextInfo.idl',
-    'nsILoadGroup.idl',
-    'nsILoadGroupChild.idl',
-    'nsIMIMEInputStream.idl',
-    'nsIMultiPartChannel.idl',
-    'nsINestedURI.idl',
-    'nsINetAddr.idl',
-    'nsINetUtil.idl',
-    'nsINetworkInterceptController.idl',
-    'nsINetworkLinkService.idl',
-    'nsINetworkPredictor.idl',
-    'nsINetworkPredictorVerifier.idl',
-    'nsINetworkProperties.idl',
-    'nsINSSErrorsService.idl',
-    'nsINullChannel.idl',
-    'nsIParentChannel.idl',
-    'nsIParentRedirectingChannel.idl',
-    'nsIPermission.idl',
-    'nsIPermissionManager.idl',
-    'nsIPrivateBrowsingChannel.idl',
-    'nsIProgressEventSink.idl',
-    'nsIPrompt.idl',
-    'nsIProtocolHandler.idl',
-    'nsIProtocolProxyCallback.idl',
-    'nsIProtocolProxyFilter.idl',
-    'nsIProtocolProxyService.idl',
-    'nsIProtocolProxyService2.idl',
-    'nsIProxiedChannel.idl',
-    'nsIProxiedProtocolHandler.idl',
-    'nsIProxyInfo.idl',
-    'nsIRandomGenerator.idl',
-    'nsIRedirectChannelRegistrar.idl',
-    'nsIRedirectHistory.idl',
-    'nsIRedirectResultListener.idl',
-    'nsIRequest.idl',
-    'nsIRequestObserver.idl',
-    'nsIRequestObserverProxy.idl',
-    'nsIResumableChannel.idl',
-    'nsISecretDecoderRing.idl',
-    'nsISecureBrowserUI.idl',
-    'nsISecurityEventSink.idl',
-    'nsISecurityInfoProvider.idl',
-    'nsISerializationHelper.idl',
-    'nsIServerSocket.idl',
-    'nsISimpleStreamListener.idl',
-    'nsISiteSecurityService.idl',
-    'nsISocketTransport.idl',
-    'nsISocketTransportService.idl',
-    'nsISpeculativeConnect.idl',
-    'nsIStandardURL.idl',
-    'nsIStreamingProtocolController.idl',
-    'nsIStreamingProtocolService.idl',
-    'nsIStreamListener.idl',
-    'nsIStreamListenerTee.idl',
-    'nsIStreamLoader.idl',
-    'nsIStreamTransportService.idl',
-    'nsISyncStreamListener.idl',
-    'nsISystemProxySettings.idl',
-    'nsIThreadRetargetableRequest.idl',
-    'nsIThreadRetargetableStreamListener.idl',
-    'nsITimedChannel.idl',
-    'nsITLSServerSocket.idl',
-    'nsITraceableChannel.idl',
-    'nsITransport.idl',
-    'nsIUDPSocket.idl',
-    'nsIUDPSocketFilter.idl',
-    'nsIUnicharStreamLoader.idl',
-    'nsIUploadChannel.idl',
-    'nsIUploadChannel2.idl',
-    'nsIURI.idl',
-    'nsIURIChecker.idl',
-    'nsIURIClassifier.idl',
-    'nsIURIWithPrincipal.idl',
-    'nsIURL.idl',
-    'nsIURLParser.idl',
-    'nsPILoadGroupInternal.idl',
-    'nsPISocketTransportService.idl',
-]
-
-if CONFIG['MOZ_TOOLKIT_SEARCH']:
-    XPIDL_SOURCES += [
-        'nsIBrowserSearchService.idl',
-    ]
-
-XPIDL_MODULE = 'necko'
-
-EXPORTS += [
-    'netCore.h',
-    'nsASocketHandler.h',
-    'nsAsyncRedirectVerifyHelper.h',
-    'nsNetUtil.h',
-    'nsReadLine.h',
-    'nsStreamListenerWrapper.h',
-    'nsURIHashKey.h',
-]
-
-EXPORTS.mozilla.net += [
-    'ReferrerPolicy.h',
-]
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    EXPORTS += [
-        'NetStatistics.h',
-    ]
-
-FAIL_ON_WARNINGS = True
-
rename from netwerk/base/public/security-prefs.js
rename to netwerk/base/security-prefs.js
deleted file mode 100644
--- a/netwerk/base/src/moz.build
+++ /dev/null
@@ -1,138 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-EXPORTS += [
-    'nsFileStreams.h',
-    'nsMIMEInputStream.h',
-    'nsTemporaryFileInputStream.h',
-    'nsURLHelper.h',
-    'nsURLParsers.h',
-]
-
-EXPORTS.mozilla.net += [
-    'ChannelDiverterChild.h',
-    'ChannelDiverterParent.h',
-    'Dashboard.h',
-    'DashboardTypes.h',
-    'OfflineObserver.h',
-]
-
-UNIFIED_SOURCES += [
-    'ArrayBufferInputStream.cpp',
-    'BackgroundFileSaver.cpp',
-    'ChannelDiverterChild.cpp',
-    'ChannelDiverterParent.cpp',
-    'Dashboard.cpp',
-    'EventTokenBucket.cpp',
-    'LoadContextInfo.cpp',
-    'NetworkActivityMonitor.cpp',
-    'nsAsyncRedirectVerifyHelper.cpp',
-    'nsAsyncStreamCopier.cpp',
-    'nsAuthInformationHolder.cpp',
-    'nsBase64Encoder.cpp',
-    'nsBaseChannel.cpp',
-    'nsBaseContentStream.cpp',
-    'nsBufferedStreams.cpp',
-    'nsChannelClassifier.cpp',
-    'nsDirectoryIndexStream.cpp',
-    'nsDNSPrefetch.cpp',
-    'nsDownloader.cpp',
-    'nsFileStreams.cpp',
-    'nsIncrementalDownload.cpp',
-    'nsInputStreamChannel.cpp',
-    'nsInputStreamPump.cpp',
-    'nsIOService.cpp',
-    'nsLoadGroup.cpp',
-    'nsMediaFragmentURIParser.cpp',
-    'nsMIMEInputStream.cpp',
-    'nsNetAddr.cpp',
-    'nsNetUtil.cpp',
-    'nsPACMan.cpp',
-    'nsPreloadedStream.cpp',
-    'nsProtocolProxyService.cpp',
-    'nsProxyInfo.cpp',
-    'nsRequestObserverProxy.cpp',
-    'nsSerializationHelper.cpp',
-    'nsServerSocket.cpp',
-    'nsSimpleNestedURI.cpp',
-    'nsSimpleStreamListener.cpp',
-    'nsSimpleURI.cpp',
-    'nsSocketTransport2.cpp',
-    'nsSocketTransportService2.cpp',
-    'nsStandardURL.cpp',
-    'nsStreamListenerTee.cpp',
-    'nsStreamListenerWrapper.cpp',
-    'nsStreamLoader.cpp',
-    'nsStreamTransportService.cpp',
-    'nsSyncStreamListener.cpp',
-    'nsTemporaryFileInputStream.cpp',
-    'nsTransportUtils.cpp',
-    'nsUDPSocket.cpp',
-    'nsUnicharStreamLoader.cpp',
-    'nsURIChecker.cpp',
-    'nsURLHelper.cpp',
-    'nsURLParsers.cpp',
-    'OfflineObserver.cpp',
-    'Predictor.cpp',
-    'ProxyAutoConfig.cpp',
-    'RedirectChannelRegistrar.cpp',
-    'StreamingProtocolService.cpp',
-    'Tickler.cpp',
-    'TLSServerSocket.cpp',
-]
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
-    SOURCES += [
-        'nsAutodialWin.cpp',
-        'nsNativeConnectionHelper.cpp',
-        'nsURLHelperWin.cpp',
-    ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    SOURCES += [
-        'nsURLHelperOSX.cpp',
-    ]
-else:
-    SOURCES += [
-        'nsURLHelperUnix.cpp',
-    ]
-
-if CONFIG['MOZ_ENABLE_QTNETWORK']:
-    SOURCES += [
-        'nsAutodialQt.cpp',
-    ]
-
-EXTRA_JS_MODULES += [
-    'NetUtil.jsm',
-]
-
-FAIL_ON_WARNINGS = True
-
-MSVC_ENABLE_PGO = True
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-FINAL_LIBRARY = 'xul'
-LOCAL_INCLUDES += [
-    '/dom/base',
-    '/netwerk/protocol/http'
-]
-
-if 'rtsp' in CONFIG['NECKO_PROTOCOLS']:
-    LOCAL_INCLUDES += [
-        '/netwerk/protocol/rtsp/controller',
-        '/netwerk/protocol/rtsp/rtsp',
-    ]
-
-if CONFIG['MOZ_ENABLE_QTNETWORK']:
-    LOCAL_INCLUDES += [
-        '/netwerk/system/qt',
-    ]
-
-if CONFIG['ENABLE_TESTS']:
-    DEFINES['PREDICTOR_TESTS'] = True
-
-if CONFIG['MOZ_ENABLE_QTNETWORK']:
-    CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']
--- a/netwerk/build/moz.build
+++ b/netwerk/build/moz.build
@@ -16,17 +16,17 @@ FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../base/src',
+    '../base',
     '../cache',
     '../dns',
     '../mime',
     '../protocol/about',
     '../protocol/app',
     '../socket',
     '../streamconv/converters',
     '../streamconv/src',
--- a/netwerk/cache/moz.build
+++ b/netwerk/cache/moz.build
@@ -43,10 +43,10 @@ UNIFIED_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../base/src',
+    '../base',
 ]
--- a/netwerk/cache2/moz.build
+++ b/netwerk/cache2/moz.build
@@ -43,17 +43,17 @@ UNIFIED_SOURCES += [
 ]
 
 # AppCacheStorage.cpp cannot be built in unified mode because it uses plarena.h.
 SOURCES += [
     'AppCacheStorage.cpp',
 ]
 
 LOCAL_INCLUDES += [
-    '../base/src',
+    '../base',
     '../cache',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'
--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
@@ -57,10 +57,10 @@ include('/ipc/chromium/chromium-config.m
 FINAL_LIBRARY = 'xul'
 
 GENERATED_FILES = [
     'etld_data.inc',
 ]
 
 # need to include etld_data.inc
 LOCAL_INCLUDES += [
-    '../base/src',
+    '../base',
 ]
--- a/netwerk/ipc/moz.build
+++ b/netwerk/ipc/moz.build
@@ -40,13 +40,13 @@ IPDL_SOURCES = [
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../base/src',
+    '../base',
     '../protocol/http',
     '/caps',
     '/modules/libjar',
 ]
--- a/netwerk/protocol/about/moz.build
+++ b/netwerk/protocol/about/moz.build
@@ -24,11 +24,11 @@ UNIFIED_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../base/src',
+    '../../base',
     '../../cache2',
 ]
--- a/netwerk/protocol/app/moz.build
+++ b/netwerk/protocol/app/moz.build
@@ -8,12 +8,12 @@ SOURCES += [
     'AppProtocolHandler.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../../../modules/libjar',
-    '../../base/src',
+    '../../base',
     '/caps',
 ]
 
--- a/netwerk/protocol/data/moz.build
+++ b/netwerk/protocol/data/moz.build
@@ -8,11 +8,11 @@ UNIFIED_SOURCES += [
     'nsDataChannel.cpp',
     'nsDataHandler.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../../base/src',
+    '../../base',
 ]
 
--- a/netwerk/protocol/device/moz.build
+++ b/netwerk/protocol/device/moz.build
@@ -20,10 +20,10 @@ UNIFIED_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../base/src/',
+    '../../base/',
 ]
--- a/netwerk/protocol/file/moz.build
+++ b/netwerk/protocol/file/moz.build
@@ -18,10 +18,10 @@ UNIFIED_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../base/src',
+    '../../base',
 ]
--- a/netwerk/protocol/ftp/moz.build
+++ b/netwerk/protocol/ftp/moz.build
@@ -36,10 +36,10 @@ FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../base/src',
+    '../../base',
 ]
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -103,11 +103,11 @@ FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../base/src',
+    '../../base',
     '/dom/base',
 ]
--- a/netwerk/protocol/http/nsHttpHandler.h
+++ b/netwerk/protocol/http/nsHttpHandler.h
@@ -493,17 +493,17 @@ private:
     // The maximum amount of time to wait for socket transport to be
     // established. In milliseconds.
     uint32_t       mConnectTimeout;
 
     // The maximum number of current global half open sockets allowable
     // when starting a new speculative connection.
     uint32_t       mParallelSpeculativeConnectLimit;
 
-    // For Rate Pacing of HTTP/1 requests through a netwerk/base/src/EventTokenBucket
+    // For Rate Pacing of HTTP/1 requests through a netwerk/base/EventTokenBucket
     // Active requests <= *MinParallelism are not subject to the rate pacing
     bool           mRequestTokenBucketEnabled;
     uint16_t       mRequestTokenBucketMinParallelism;
     uint32_t       mRequestTokenBucketHz;  // EventTokenBucket HZ
     uint32_t       mRequestTokenBucketBurst; // EventTokenBucket Burst
 
     // Whether or not to block requests for non head js/css items (e.g. media)
     // while those elements load.
--- a/netwerk/protocol/res/moz.build
+++ b/netwerk/protocol/res/moz.build
@@ -18,10 +18,10 @@ FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '/netwerk/base/src',
+    '/netwerk/base',
 ]
--- a/netwerk/protocol/rtsp/moz.build
+++ b/netwerk/protocol/rtsp/moz.build
@@ -55,17 +55,17 @@ if CONFIG['GNU_CC']:
   CXXFLAGS += ['-Wno-error=attributes']
 
 FINAL_LIBRARY = 'xul'
 
 DEFINES['IMPL_NS_NET'] = True
 DEFINES['FORCE_PR_LOG'] = True
 
 LOCAL_INCLUDES += [
-    '../../base/src',
+    '../../base',
     '/dom/base',
     'controller',
     'rtsp',
 ]
 
 for var in ('IMPL_NS_NET', 'FORCE_PR_LOG'):
     DEFINES[var] = True
 
--- a/netwerk/protocol/viewsource/moz.build
+++ b/netwerk/protocol/viewsource/moz.build
@@ -14,11 +14,11 @@ UNIFIED_SOURCES += [
     'nsViewSourceChannel.cpp',
     'nsViewSourceHandler.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../../base/src',
+    '../../base',
 ]
 
--- a/netwerk/protocol/websocket/moz.build
+++ b/netwerk/protocol/websocket/moz.build
@@ -35,11 +35,11 @@ FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../base/src',
+    '../../base',
     '/dom/base',
 ]
--- a/netwerk/protocol/wyciwyg/moz.build
+++ b/netwerk/protocol/wyciwyg/moz.build
@@ -31,10 +31,10 @@ IPDL_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../base/src',
+    '../../base',
 ]
--- a/netwerk/sctp/src/moz.build
+++ b/netwerk/sctp/src/moz.build
@@ -41,17 +41,17 @@ if CONFIG['OS_TARGET'] == 'Android':
 
 Library('nksctp_s')
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../base/src',
+    '../../base',
     '/dom/base',
 ]
 
 for var in ('SCTP_SIMPLE_ALLOCATOR',
             'SCTP_PROCESS_LEVEL_LOCKS', '__Userspace__', 'INET',
             'CALLBACK_API', 'SCTP_DEBUG'):
     DEFINES[var] = 1
 
--- a/netwerk/streamconv/converters/moz.build
+++ b/netwerk/streamconv/converters/moz.build
@@ -28,10 +28,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'coco
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '/netwerk/base/src',
+    '/netwerk/base',
 ]
--- a/netwerk/system/android/moz.build
+++ b/netwerk/system/android/moz.build
@@ -7,11 +7,11 @@
 SOURCES += [
     'nsAndroidNetworkLinkService.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../../base/src',
+    '../../base',
 ]
 
--- a/netwerk/system/qt/moz.build
+++ b/netwerk/system/qt/moz.build
@@ -12,12 +12,12 @@ SOURCES += [
 GENERATED_SOURCES += [
     'moc_nsQtNetworkManager.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../../base/src',
+    '../../base',
 ]
 
 CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']
--- a/toolkit/components/url-classifier/nsCheckSummedOutputStream.h
+++ b/toolkit/components/url-classifier/nsCheckSummedOutputStream.h
@@ -7,17 +7,17 @@
 #define nsCheckSummedOutputStream_h__
 
 #include "nsILocalFile.h"
 #include "nsIFile.h"
 #include "nsIOutputStream.h"
 #include "nsICryptoHash.h"
 #include "nsNetCID.h"
 #include "nsString.h"
-#include "../../../netwerk/base/src/nsFileStreams.h"
+#include "../../../netwerk/base/nsFileStreams.h"
 #include "nsToolkitCompsCID.h"
 
 class nsCheckSummedOutputStream : public nsSafeFileOutputStream
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
 
   // Size of MD5 hash in bytes
--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
@@ -121,17 +121,17 @@ FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/dom/base',
     '/dom/ipc',
-    '/netwerk/base/src',
+    '/netwerk/base',
     '/netwerk/protocol/http',
 ]
 
 if CONFIG['MOZ_ENABLE_DBUS']:
     CXXFLAGS += CONFIG['TK_CFLAGS']
     CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt', 'gtk2', 'gtk3'):
--- a/widget/android/moz.build
+++ b/widget/android/moz.build
@@ -51,15 +51,15 @@ FAIL_ON_WARNINGS = True
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/docshell/base',
     '/dom/base',
     '/dom/system/android',
-    '/netwerk/base/src',
+    '/netwerk/base',
     '/netwerk/cache',
     '/widget',
     '/widget/android/android',
 ]
 
 #DEFINES['DEBUG_WIDGETS'] = True