From 69790bc62e4f6cb688af6009313bc4d17038efb9 Mon Sep 17 00:00:00 2001 From: Gabriele Svelto Date: Fri, 6 Dec 2019 09:16:44 +0000 Subject: [PATCH] Bug 1600545 - Remove useless inclusions of header files generated from IDL files in accessible/, browser/, caps/, chrome/, devtools/, docshell/, editor/, extensions/, gfx/, hal/, image/, intl/, ipc/, js/, layout/, and media/ r=Ehsan The inclusions were removed with the following very crude script and the resulting breakage was fixed up by hand. The manual fixups did either revert the changes done by the script, replace a generic header with a more specific one or replace a header with a forward declaration. find . -name "*.idl" | grep -v web-platform | grep -v third_party | while read path; do interfaces=$(grep "^\(class\|interface\).*:.*" "$path" | cut -d' ' -f2) if [ -n "$interfaces" ]; then if [[ "$interfaces" == *$'\n'* ]]; then regexp="\(" for i in $interfaces; do regexp="$regexp$i\|"; done regexp="${regexp%%\\\|}\)" else regexp="$interfaces" fi interface=$(basename "$path") rg -l "#include.*${interface%%.idl}.h" . | while read path2; do hits=$(grep -v "#include.*${interface%%.idl}.h" "$path2" | grep -c "$regexp" ) if [ $hits -eq 0 ]; then echo "Removing ${interface} from ${path2}" grep -v "#include.*${interface%%.idl}.h" "$path2" > "$path2".tmp mv -f "$path2".tmp "$path2" fi done fi done Differential Revision: https://phabricator.services.mozilla.com/D55443 --HG-- extra : moz-landing-system : lando --- accessible/atk/Platform.cpp | 1 - accessible/atk/nsMaiInterfaceImage.cpp | 1 - accessible/base/DocManager.cpp | 1 - accessible/base/Logging.cpp | 2 -- accessible/base/SelectionManager.cpp | 1 - accessible/base/nsAccCache.h | 2 -- accessible/base/nsAccessibilityService.cpp | 2 -- accessible/generic/ARIAGridAccessible.cpp | 1 - accessible/generic/Accessible.cpp | 3 -- accessible/generic/ApplicationAccessible.cpp | 2 -- accessible/generic/ApplicationAccessible.h | 1 - accessible/generic/DocAccessible.cpp | 2 -- accessible/generic/DocAccessible.h | 1 - accessible/generic/HyperTextAccessible-inl.h | 1 - accessible/generic/HyperTextAccessible.cpp | 1 - accessible/generic/HyperTextAccessible.h | 2 -- accessible/generic/ImageAccessible.cpp | 1 - accessible/generic/RootAccessible.cpp | 2 -- accessible/html/HTMLElementAccessibles.cpp | 1 - accessible/html/HTMLFormControlAccessible.cpp | 4 --- accessible/html/HTMLImageMapAccessible.cpp | 1 - accessible/html/HTMLTableAccessible.cpp | 1 - accessible/ipc/ProxyAccessibleBase.cpp | 1 - accessible/ipc/other/DocAccessibleChild.cpp | 1 - accessible/ipc/other/ProxyAccessible.cpp | 1 - accessible/ipc/win/COMPtrTypes.cpp | 1 - accessible/ipc/win/ProxyAccessible.cpp | 1 - accessible/ipc/win/ProxyAccessible.h | 2 -- .../ipc/win/handler/AccessibleHandler.cpp | 1 - .../ipc/win/handler/HandlerDataCleanup.h | 1 - accessible/mac/mozAccessible.mm | 2 -- .../windows/ia2/ia2AccessibleHyperlink.cpp | 1 - accessible/windows/ia2/ia2AccessibleImage.cpp | 1 - .../windows/ia2/ia2AccessibleTableCell.cpp | 1 - accessible/windows/ia2/ia2AccessibleText.cpp | 1 - accessible/windows/ia2/ia2AccessibleText.h | 2 -- accessible/windows/msaa/AccessibleWrap.cpp | 3 -- accessible/windows/msaa/AccessibleWrap.h | 1 - accessible/windows/msaa/Compatibility.cpp | 1 + .../windows/msaa/ImageAccessibleWrap.cpp | 1 - accessible/windows/msaa/MsaaIdGenerator.cpp | 1 - accessible/windows/msaa/Platform.cpp | 2 -- accessible/windows/msaa/ServiceProvider.cpp | 1 - .../windows/msaa/XULListboxAccessibleWrap.h | 1 - accessible/windows/msaa/nsWinUtils.cpp | 2 -- accessible/xpcom/xpcAccessibleHyperLink.cpp | 1 - accessible/xpcom/xpcAccessibleHyperText.cpp | 1 - accessible/xpcom/xpcAccessibleSelectable.cpp | 1 - accessible/xpcom/xpcAccessibleTable.cpp | 1 - accessible/xpcom/xpcAccessibleTableCell.cpp | 1 - accessible/xpcom/xpcAccessibleTextRange.cpp | 1 - accessible/xul/XULComboboxAccessible.cpp | 2 -- accessible/xul/XULFormControlAccessible.cpp | 2 -- accessible/xul/XULListboxAccessible.cpp | 3 -- accessible/xul/XULListboxAccessible.h | 2 -- accessible/xul/XULMenuAccessible.cpp | 3 -- accessible/xul/XULMenuAccessible.h | 1 - accessible/xul/XULSelectControlAccessible.cpp | 2 -- accessible/xul/XULSelectControlAccessible.h | 1 - accessible/xul/XULTabAccessible.cpp | 1 - accessible/xul/XULTreeAccessible.cpp | 4 --- accessible/xul/XULTreeGridAccessible.cpp | 1 - accessible/xul/XULTreeGridAccessible.h | 2 -- browser/app/nsBrowserApp.cpp | 1 - browser/components/about/AboutRedirector.cpp | 1 - .../dirprovider/DirectoryProvider.cpp | 2 -- .../dirprovider/DirectoryProvider.h | 1 - .../migration/nsIEHistoryEnumerator.cpp | 2 +- .../components/shell/nsGNOMEShellService.cpp | 3 -- .../components/shell/nsMacShellService.cpp | 4 --- .../shell/nsWindowsShellService.cpp | 4 --- caps/BasePrincipal.cpp | 3 -- caps/ContentPrincipal.h | 2 -- caps/DomainPolicy.cpp | 2 -- caps/NullPrincipal.cpp | 1 - caps/NullPrincipal.h | 1 - caps/SystemPrincipal.cpp | 4 --- caps/nsJSPrincipals.cpp | 3 -- caps/nsScriptSecurityManager.cpp | 13 -------- chrome/nsChromeProtocolHandler.cpp | 3 -- chrome/nsChromeRegistry.cpp | 3 -- chrome/nsChromeRegistryChrome.cpp | 2 -- chrome/nsChromeRegistryContent.cpp | 1 - devtools/platform/nsJSInspector.cpp | 1 - docshell/base/CanonicalBrowsingContext.h | 2 -- docshell/base/nsCTooltipTextProvider.h | 2 -- docshell/base/nsDSURIContentListener.cpp | 1 - docshell/base/nsDefaultURIFixup.cpp | 1 - docshell/base/nsDocShell.cpp | 10 ------ docshell/base/nsDocShell.h | 1 - docshell/base/nsDocShellEditorData.cpp | 1 - docshell/base/nsDocShellLoadState.cpp | 1 - docshell/base/nsDocShellTreeOwner.cpp | 5 --- docshell/base/nsDocShellTreeOwner.h | 3 +- docshell/shistory/ChildSHistory.cpp | 2 -- docshell/shistory/nsSHEntryShared.cpp | 2 -- editor/composer/ComposerCommandsUpdater.cpp | 1 - editor/composer/nsEditingSession.cpp | 18 +++++------ editor/libeditor/CSSEditUtils.cpp | 1 - editor/libeditor/CreateElementTransaction.cpp | 1 - editor/libeditor/DeleteTextTransaction.cpp | 1 - editor/libeditor/EditorBase.cpp | 2 -- editor/libeditor/EditorBase.h | 1 - editor/libeditor/EditorEventListener.cpp | 20 +++++------- editor/libeditor/EditorUtils.cpp | 1 - editor/libeditor/EditorUtils.h | 1 - editor/libeditor/HTMLAbsPositionEditor.cpp | 2 -- editor/libeditor/HTMLAnonymousNodeEditor.cpp | 3 -- editor/libeditor/HTMLEditSubActionHandler.cpp | 1 - editor/libeditor/HTMLEditor.cpp | 2 -- editor/libeditor/HTMLEditorDataTransfer.cpp | 3 +- .../libeditor/HTMLEditorDocumentCommands.cpp | 22 ++++++------- editor/libeditor/HTMLInlineTableEditor.cpp | 1 - editor/libeditor/TextEditSubActionHandler.cpp | 1 - editor/libeditor/TextEditorDataTransfer.cpp | 2 -- editor/txmgr/nsTransactionManagerCID.h | 1 - extensions/auth/nsAuthGSSAPI.cpp | 2 -- extensions/auth/nsAuthSASL.cpp | 2 +- extensions/auth/nsAuthSSPI.cpp | 2 +- extensions/auth/nsHttpNegotiateAuth.cpp | 6 +--- extensions/permissions/nsContentBlocker.cpp | 2 -- .../permissions/nsPermissionManager.cpp | 6 ++-- extensions/permissions/nsPermissionManager.h | 1 - .../pref/autoconfig/src/nsAutoConfig.cpp | 4 +-- extensions/pref/autoconfig/src/nsAutoConfig.h | 4 +-- .../autoconfig/src/nsJSConfigTriggers.cpp | 5 --- .../pref/autoconfig/src/nsReadConfig.cpp | 2 -- .../spellcheck/hunspell/glue/mozHunspell.cpp | 2 -- .../spellcheck/src/mozEnglishWordUtils.cpp | 2 +- .../spellcheck/src/mozInlineSpellChecker.cpp | 4 --- .../spellcheck/src/mozInlineSpellWordUtil.cpp | 1 - .../spellcheck/src/mozPersonalDictionary.cpp | 2 -- extensions/spellcheck/src/mozSpellChecker.cpp | 1 - gfx/gl/GLLibraryEGL.h | 1 - gfx/ipc/GPUProcessHost.cpp | 1 - gfx/ipc/GPUProcessManager.h | 1 - gfx/layers/LayerScope.cpp | 4 --- gfx/layers/PaintThread.cpp | 1 - gfx/layers/client/ClientLayerManager.h | 1 - gfx/layers/ipc/CompositorBridgeChild.cpp | 1 - gfx/layers/ipc/ImageBridgeChild.h | 1 - gfx/src/gfxCrashReporterUtils.cpp | 1 - gfx/thebes/DeviceManagerDx.cpp | 1 - gfx/thebes/gfxASurface.cpp | 2 -- gfx/thebes/gfxAndroidPlatform.cpp | 1 - gfx/thebes/gfxDWriteCommon.h | 2 -- gfx/thebes/gfxDWriteFontList.cpp | 3 -- gfx/thebes/gfxFT2FontList.cpp | 2 -- gfx/thebes/gfxFontInfoLoader.h | 1 - gfx/thebes/gfxGDIFontList.cpp | 2 -- gfx/thebes/gfxUserFontSet.cpp | 1 - gfx/thebes/gfxUserFontSet.h | 2 -- gfx/thebes/gfxWindowsPlatform.cpp | 2 -- gfx/vr/VRDisplayClient.cpp | 1 - gfx/vr/VRDisplayClient.h | 1 - hal/Hal.cpp | 3 -- image/DecodePool.cpp | 2 -- image/ImageCacheKey.cpp | 1 - image/ImageFactory.cpp | 2 -- image/ProgressTracker.cpp | 1 - image/RasterImage.h | 1 - image/decoders/icon/android/nsIconChannel.cpp | 2 +- image/decoders/icon/android/nsIconChannel.h | 1 - image/decoders/icon/gtk/nsIconChannel.h | 1 - image/decoders/icon/mac/nsIconChannelCocoa.mm | 3 -- image/decoders/icon/nsIconProtocolHandler.cpp | 3 -- image/decoders/icon/win/nsIconChannel.cpp | 2 -- image/decoders/nsBMPDecoder.cpp | 1 - image/decoders/nsGIFDecoder2.cpp | 1 - image/decoders/nsPNGDecoder.cpp | 1 - image/imgFrame.h | 1 - image/imgLoader.cpp | 1 - image/test/fuzzing/TestDecoders.cpp | 1 - image/test/gtest/Common.cpp | 2 +- image/test/gtest/Common.h | 1 - image/test/gtest/TestContainers.cpp | 1 - image/test/gtest/TestDecodeToSurface.cpp | 1 - image/test/gtest/TestDecoders.cpp | 3 -- image/test/gtest/TestMetadata.cpp | 3 -- image/test/gtest/TestSurfaceCache.cpp | 1 - intl/chardet/tools/GenCyrillicClass.cpp | 2 -- .../hyphenation/glue/nsHyphenationManager.cpp | 1 - intl/locale/DateTimeFormat.cpp | 1 - intl/locale/LocaleService.cpp | 1 - intl/locale/nsCollation.cpp | 1 - intl/locale/nsLocaleConstructors.h | 1 - intl/locale/tests/gtest/TestLocaleService.cpp | 1 - .../gtest/TestLocaleServiceNegotiate.cpp | 1 - intl/lwbrk/gtest/TestLineBreak.cpp | 1 - intl/strres/nsStringBundle.cpp | 3 -- intl/strres/nsStringBundleService.h | 1 - intl/uconv/nsTextToSubURI.cpp | 1 - ipc/glue/BackgroundImpl.cpp | 1 - ipc/glue/BackgroundParentImpl.cpp | 1 - ipc/glue/CrashReporterHost.cpp | 1 - ipc/glue/InputStreamUtils.cpp | 3 +- ipc/glue/MessageChannel.cpp | 1 + ipc/glue/MessageChannel.h | 1 - ipc/glue/MessagePump.cpp | 1 - ipc/glue/ProtocolUtils.h | 1 - ipc/glue/WindowsMessageLoop.cpp | 1 - ipc/ipdl/test/cxx/IPDLUnitTests.h | 2 -- ipc/mscom/InterceptorLog.cpp | 2 +- ipc/testshell/XPCShellEnvironment.cpp | 5 --- js/ductwork/debugger/JSDebugger.cpp | 1 - js/ipc/JavaScriptParent.cpp | 1 + js/xpconnect/loader/AutoMemMap.h | 1 - js/xpconnect/loader/mozJSComponentLoader.cpp | 2 -- js/xpconnect/src/XPCJSContext.cpp | 6 ---- js/xpconnect/src/XPCJSRuntime.cpp | 3 -- js/xpconnect/src/XPCRuntimeService.cpp | 1 - js/xpconnect/src/XPCWrappedNativeScope.cpp | 1 - js/xpconnect/src/nsXPConnect.cpp | 2 -- js/xpconnect/src/xpcprivate.h | 1 - .../components/native/xpctest_returncode.cpp | 1 - js/xpconnect/wrappers/XrayWrapper.cpp | 2 ++ layout/base/PresShell.cpp | 3 -- layout/base/PresShell.h | 2 +- layout/base/nsPresContext.cpp | 1 - layout/base/nsPresContext.h | 1 - layout/base/nsStyleSheetService.cpp | 1 - layout/build/nsContentDLF.cpp | 6 ---- layout/build/nsLayoutModule.cpp | 1 - layout/forms/nsButtonFrameRenderer.h | 1 - layout/forms/nsComboboxControlFrame.cpp | 1 - layout/forms/nsDateTimeControlFrame.cpp | 1 - layout/forms/nsListControlFrame.cpp | 1 - layout/forms/nsNumberControlFrame.cpp | 1 - layout/forms/nsTextControlFrame.cpp | 1 - layout/generic/nsFrame.cpp | 1 - layout/generic/nsFrameSelection.cpp | 4 --- layout/generic/nsGfxScrollFrame.cpp | 2 -- layout/generic/nsImageFrame.cpp | 1 - layout/generic/nsImageMap.cpp | 1 - layout/generic/nsPluginFrame.cpp | 1 - layout/generic/nsSubDocumentFrame.cpp | 1 - layout/generic/nsTextRunTransformations.cpp | 1 - layout/inspector/InspectorUtils.cpp | 2 -- layout/inspector/inLayoutUtils.cpp | 2 -- layout/ipc/VsyncParent.cpp | 1 - layout/painting/nsCSSRendering.cpp | 1 - layout/painting/nsCSSRendering.h | 1 - layout/painting/nsDisplayList.cpp | 1 - layout/painting/nsDisplayListInvalidation.h | 1 - .../PrintPreviewUserEventSuppressor.cpp | 1 - layout/printing/nsPagePrintTimer.cpp | 2 -- layout/printing/nsPrintData.cpp | 1 - layout/printing/nsPrintData.h | 2 +- layout/printing/nsPrintJob.cpp | 15 --------- layout/style/CSS.cpp | 1 - layout/style/CachedInheritingStyles.cpp | 1 - layout/style/ComputedStyle.h | 1 - layout/style/DeclarationBlock.cpp | 1 - layout/style/ErrorReporter.cpp | 1 - layout/style/FontFaceSet.cpp | 2 -- layout/style/GeckoBindings.cpp | 3 -- layout/style/Loader.cpp | 2 -- layout/style/ServoStyleSet.h | 1 + layout/style/StyleSheet.cpp | 31 +++++++++---------- layout/style/nsCSSValue.cpp | 2 -- layout/style/nsComputedDOMStyle.cpp | 1 - layout/style/nsDOMCSSAttrDeclaration.cpp | 1 - layout/style/nsDOMCSSDeclaration.cpp | 1 - layout/style/nsDOMCSSDeclaration.h | 1 - layout/style/nsFontFaceLoader.cpp | 3 -- layout/style/nsStyleStruct.cpp | 1 - layout/style/nsStyleUtil.cpp | 2 -- layout/svg/nsSVGImageFrame.h | 1 - layout/tables/nsTableCellFrame.cpp | 1 - layout/tables/nsTableFrame.h | 1 - layout/tables/nsTableWrapperFrame.cpp | 1 - .../layout-debug/src/nsLayoutDebugCLH.cpp | 3 +- .../src/nsLayoutDebuggingTools.cpp | 2 -- layout/xul/nsBox.cpp | 1 - layout/xul/nsBoxFrame.cpp | 2 -- layout/xul/nsDocElementBoxFrame.cpp | 1 - layout/xul/nsImageBoxFrame.cpp | 3 -- layout/xul/nsImageBoxFrame.h | 2 +- layout/xul/nsMenuBarFrame.cpp | 1 - layout/xul/nsMenuBarListener.cpp | 1 - layout/xul/nsMenuFrame.cpp | 3 -- layout/xul/nsMenuPopupFrame.cpp | 4 +-- layout/xul/nsMenuPopupFrame.h | 3 -- layout/xul/nsRepeatService.cpp | 1 - layout/xul/nsResizerFrame.cpp | 1 - layout/xul/nsScrollbarButtonFrame.h | 1 - layout/xul/nsSliderFrame.cpp | 1 - layout/xul/nsSplitterFrame.cpp | 1 - layout/xul/nsTextBoxFrame.cpp | 1 - layout/xul/nsXULPopupManager.cpp | 2 -- layout/xul/nsXULTooltipListener.cpp | 1 - layout/xul/tree/nsTreeBodyFrame.cpp | 2 -- media/mtransport/WebrtcTCPSocketWrapper.cpp | 1 - media/mtransport/ipc/StunAddrsRequestParent.h | 3 -- media/mtransport/ipc/WebrtcTCPSocket.cpp | 1 - media/mtransport/nr_socket_prsock.cpp | 2 -- media/mtransport/nr_socket_prsock.h | 1 - media/mtransport/nricectx.cpp | 2 -- media/mtransport/nricectx.h | 1 - media/mtransport/nricemediastream.h | 2 -- .../test/runnable_utils_unittest.cpp | 5 --- .../test/sockettransportservice_unittest.cpp | 4 --- media/mtransport/transportlayerdtls.cpp | 1 - media/mtransport/transportlayerdtls.h | 1 - media/mtransport/transportlayerice.cpp | 1 - media/mtransport/transportlayerice.h | 2 -- media/mtransport/transportlayerloopback.cpp | 6 ---- .../src/media-conduit/AudioConduit.cpp | 2 -- .../src/media-conduit/WebrtcGmpVideoCodec.cpp | 1 - .../peerconnection/MediaTransportHandler.cpp | 1 - .../src/peerconnection/PeerConnectionCtx.cpp | 1 - .../src/peerconnection/PeerConnectionImpl.cpp | 9 +----- .../src/peerconnection/PeerConnectionImpl.h | 2 -- .../peerconnection/PeerConnectionMedia.cpp | 4 --- netwerk/cookie/nsCookie.h | 1 + widget/android/ImageDecoderSupport.cpp | 1 + 316 files changed, 75 insertions(+), 585 deletions(-) diff --git a/accessible/atk/Platform.cpp b/accessible/atk/Platform.cpp index c06f9dad46d75..9d877bab1c327 100644 --- a/accessible/atk/Platform.cpp +++ b/accessible/atk/Platform.cpp @@ -8,7 +8,6 @@ #include "nsIAccessibleEvent.h" #include "nsIGSettingsService.h" -#include "nsIServiceManager.h" #include "nsMai.h" #include "AtkSocketAccessible.h" #include "prenv.h" diff --git a/accessible/atk/nsMaiInterfaceImage.cpp b/accessible/atk/nsMaiInterfaceImage.cpp index a223578206657..c9559becab73d 100644 --- a/accessible/atk/nsMaiInterfaceImage.cpp +++ b/accessible/atk/nsMaiInterfaceImage.cpp @@ -11,7 +11,6 @@ #include "mozilla/Likely.h" #include "nsMai.h" #include "nsIAccessibleTypes.h" -#include "nsIURI.h" #include "ProxyAccessible.h" using namespace mozilla; diff --git a/accessible/base/DocManager.cpp b/accessible/base/DocManager.cpp index e87e5aae23f40..93bccca805937 100644 --- a/accessible/base/DocManager.cpp +++ b/accessible/base/DocManager.cpp @@ -14,7 +14,6 @@ #include "nsAccessibilityService.h" #include "Platform.h" #include "RootAccessibleWrap.h" -#include "xpcAccessibleDocument.h" #ifdef A11Y_LOG # include "Logging.h" diff --git a/accessible/base/Logging.cpp b/accessible/base/Logging.cpp index bc2f5bca4a3d7..61f3561952422 100644 --- a/accessible/base/Logging.cpp +++ b/accessible/base/Logging.cpp @@ -16,12 +16,10 @@ #include "nsDocShellLoadTypes.h" #include "nsIChannel.h" #include "nsIInterfaceRequestorUtils.h" -#include "nsISelectionController.h" #include "nsTraceRefcnt.h" #include "nsIWebProgress.h" #include "prenv.h" #include "nsIDocShellTreeItem.h" -#include "nsIURI.h" #include "mozilla/PresShell.h" #include "mozilla/dom/Element.h" #include "mozilla/dom/HTMLBodyElement.h" diff --git a/accessible/base/SelectionManager.cpp b/accessible/base/SelectionManager.cpp index 4ea93cae67db7..5a52ccdf401f6 100644 --- a/accessible/base/SelectionManager.cpp +++ b/accessible/base/SelectionManager.cpp @@ -14,7 +14,6 @@ #include "nsEventShell.h" #include "nsFrameSelection.h" -#include "nsIAccessibleTypes.h" #include "mozilla/PresShell.h" #include "mozilla/dom/Document.h" #include "mozilla/dom/Selection.h" diff --git a/accessible/base/nsAccCache.h b/accessible/base/nsAccCache.h index 57d8d2e8bc9aa..a6d5874867400 100644 --- a/accessible/base/nsAccCache.h +++ b/accessible/base/nsAccCache.h @@ -6,8 +6,6 @@ #ifndef _nsAccCache_H_ #define _nsAccCache_H_ -#include "xpcAccessibleDocument.h" - //////////////////////////////////////////////////////////////////////////////// // Accessible cache utils //////////////////////////////////////////////////////////////////////////////// diff --git a/accessible/base/nsAccessibilityService.cpp b/accessible/base/nsAccessibilityService.cpp index 21a7e94315e6c..82807f4f5bbb2 100644 --- a/accessible/base/nsAccessibilityService.cpp +++ b/accessible/base/nsAccessibilityService.cpp @@ -26,7 +26,6 @@ #include "nsAttrName.h" #include "nsDOMTokenList.h" #include "nsEventShell.h" -#include "nsIURI.h" #include "nsTextFormatter.h" #include "OuterDocAccessible.h" #include "Role.h" @@ -38,7 +37,6 @@ #include "TextLeafAccessibleWrap.h" #include "TreeWalker.h" #include "xpcAccessibleApplication.h" -#include "xpcAccessibleDocument.h" #ifdef MOZ_ACCESSIBILITY_ATK # include "AtkSocketAccessible.h" diff --git a/accessible/generic/ARIAGridAccessible.cpp b/accessible/generic/ARIAGridAccessible.cpp index 1efbdd692c16e..ebb6d44fd24f5 100644 --- a/accessible/generic/ARIAGridAccessible.cpp +++ b/accessible/generic/ARIAGridAccessible.cpp @@ -11,7 +11,6 @@ #include "Role.h" #include "States.h" -#include "nsIMutableArray.h" #include "nsIPersistentProperties2.h" #include "nsComponentManagerUtils.h" diff --git a/accessible/generic/Accessible.cpp b/accessible/generic/Accessible.cpp index d4fbb2cc66945..3c2ec1bbd7af1 100644 --- a/accessible/generic/Accessible.cpp +++ b/accessible/generic/Accessible.cpp @@ -57,9 +57,6 @@ #include "nsAtom.h" #include "nsIURI.h" #include "nsArrayUtils.h" -#include "nsIMutableArray.h" -#include "nsIObserverService.h" -#include "nsIServiceManager.h" #include "nsWhitespaceTokenizer.h" #include "nsAttrName.h" #include "nsPersistentProperties.h" diff --git a/accessible/generic/ApplicationAccessible.cpp b/accessible/generic/ApplicationAccessible.cpp index 114cb17b8867e..bb6cb13ce4cdc 100644 --- a/accessible/generic/ApplicationAccessible.cpp +++ b/accessible/generic/ApplicationAccessible.cpp @@ -13,8 +13,6 @@ #include "Role.h" #include "States.h" -#include "nsIComponentManager.h" -#include "nsIWindowMediator.h" #include "nsServiceManagerUtils.h" #include "mozilla/Services.h" #include "nsGlobalWindow.h" diff --git a/accessible/generic/ApplicationAccessible.h b/accessible/generic/ApplicationAccessible.h index c4a7b5198e138..e85edaab2aa22 100644 --- a/accessible/generic/ApplicationAccessible.h +++ b/accessible/generic/ApplicationAccessible.h @@ -10,7 +10,6 @@ #include "AccessibleWrap.h" -#include "nsIMutableArray.h" #include "nsIXULAppInfo.h" namespace mozilla { diff --git a/accessible/generic/DocAccessible.cpp b/accessible/generic/DocAccessible.cpp index d201bfbfc247c..6cf5155c2bcbd 100644 --- a/accessible/generic/DocAccessible.cpp +++ b/accessible/generic/DocAccessible.cpp @@ -21,7 +21,6 @@ #include "nsCommandManager.h" #include "nsContentUtils.h" -#include "nsIMutableArray.h" #include "nsIDocShell.h" #include "mozilla/dom/Document.h" #include "nsPIDOMWindow.h" @@ -30,7 +29,6 @@ #include "nsIInterfaceRequestorUtils.h" #include "nsImageFrame.h" #include "nsIPersistentProperties2.h" -#include "nsIServiceManager.h" #include "nsViewManager.h" #include "nsIScrollableFrame.h" #include "nsUnicharUtils.h" diff --git a/accessible/generic/DocAccessible.h b/accessible/generic/DocAccessible.h index da184c077e483..91cdc9fa87c03 100644 --- a/accessible/generic/DocAccessible.h +++ b/accessible/generic/DocAccessible.h @@ -19,7 +19,6 @@ #include "nsIObserver.h" #include "nsIScrollPositionListener.h" #include "nsITimer.h" -#include "nsIWeakReference.h" class nsAccessiblePivot; diff --git a/accessible/generic/HyperTextAccessible-inl.h b/accessible/generic/HyperTextAccessible-inl.h index 109123b3d0c0b..bf4edea477930 100644 --- a/accessible/generic/HyperTextAccessible-inl.h +++ b/accessible/generic/HyperTextAccessible-inl.h @@ -11,7 +11,6 @@ #include "nsAccUtils.h" #include "nsIClipboard.h" -#include "nsIPersistentProperties2.h" #include "nsFrameSelection.h" #include "mozilla/TextEditor.h" diff --git a/accessible/generic/HyperTextAccessible.cpp b/accessible/generic/HyperTextAccessible.cpp index 020a2e0e088d1..824152d3e478e 100644 --- a/accessible/generic/HyperTextAccessible.cpp +++ b/accessible/generic/HyperTextAccessible.cpp @@ -27,7 +27,6 @@ #include "nsIInterfaceRequestorUtils.h" #include "nsPersistentProperties.h" #include "nsIScrollableFrame.h" -#include "nsIServiceManager.h" #include "nsIMathMLFrame.h" #include "nsRange.h" #include "nsTextFragment.h" diff --git a/accessible/generic/HyperTextAccessible.h b/accessible/generic/HyperTextAccessible.h index 617c7a247fde2..6f47d49688522 100644 --- a/accessible/generic/HyperTextAccessible.h +++ b/accessible/generic/HyperTextAccessible.h @@ -13,8 +13,6 @@ #include "WordMovementType.h" #include "nsIFrame.h" -#include "nsISelectionController.h" - class nsFrameSelection; class nsRange; class nsIWidget; diff --git a/accessible/generic/ImageAccessible.cpp b/accessible/generic/ImageAccessible.cpp index cd3c0003f79a8..8f43c828160a9 100644 --- a/accessible/generic/ImageAccessible.cpp +++ b/accessible/generic/ImageAccessible.cpp @@ -16,7 +16,6 @@ #include "mozilla/dom/BrowsingContext.h" #include "mozilla/dom/Document.h" #include "nsIImageLoadingContent.h" -#include "nsIServiceManager.h" #include "nsIPersistentProperties2.h" #include "nsPIDOMWindow.h" #include "nsIURI.h" diff --git a/accessible/generic/RootAccessible.cpp b/accessible/generic/RootAccessible.cpp index 8028ed9d987f1..8380b49758bec 100644 --- a/accessible/generic/RootAccessible.cpp +++ b/accessible/generic/RootAccessible.cpp @@ -29,7 +29,6 @@ #include "mozilla/dom/ScriptSettings.h" #include "mozilla/dom/BrowserHost.h" -#include "nsIDocShellTreeItem.h" #include "nsIDocShellTreeOwner.h" #include "mozilla/dom/Event.h" #include "mozilla/dom/EventTarget.h" @@ -37,7 +36,6 @@ #include "mozilla/dom/Document.h" #include "nsIInterfaceRequestorUtils.h" #include "nsIPropertyBag2.h" -#include "nsIServiceManager.h" #include "nsPIDOMWindow.h" #include "nsIWebBrowserChrome.h" #include "nsReadableUtils.h" diff --git a/accessible/html/HTMLElementAccessibles.cpp b/accessible/html/HTMLElementAccessibles.cpp index ec9fada6d0e2d..9bf2462286751 100644 --- a/accessible/html/HTMLElementAccessibles.cpp +++ b/accessible/html/HTMLElementAccessibles.cpp @@ -7,7 +7,6 @@ #include "DocAccessible.h" #include "nsAccUtils.h" -#include "nsIPersistentProperties2.h" #include "nsTextEquivUtils.h" #include "Relation.h" #include "Role.h" diff --git a/accessible/html/HTMLFormControlAccessible.cpp b/accessible/html/HTMLFormControlAccessible.cpp index b0d76236c3975..ceba2539d8b0d 100644 --- a/accessible/html/HTMLFormControlAccessible.cpp +++ b/accessible/html/HTMLFormControlAccessible.cpp @@ -16,11 +16,8 @@ #include "nsContentList.h" #include "mozilla/dom/HTMLInputElement.h" #include "mozilla/dom/HTMLTextAreaElement.h" -#include "nsIEditor.h" #include "nsIFormControl.h" #include "nsIPersistentProperties2.h" -#include "nsISelectionController.h" -#include "nsIServiceManager.h" #include "nsITextControlFrame.h" #include "nsNameSpaceManager.h" #include "mozilla/dom/ScriptSettings.h" @@ -28,7 +25,6 @@ #include "mozilla/EventStates.h" #include "mozilla/FloatingPoint.h" #include "mozilla/Preferences.h" -#include "mozilla/TextControlElement.h" #include "mozilla/TextEditor.h" using namespace mozilla; diff --git a/accessible/html/HTMLImageMapAccessible.cpp b/accessible/html/HTMLImageMapAccessible.cpp index b886dd17da3d2..af416866f0597 100644 --- a/accessible/html/HTMLImageMapAccessible.cpp +++ b/accessible/html/HTMLImageMapAccessible.cpp @@ -10,7 +10,6 @@ #include "DocAccessible-inl.h" #include "Role.h" -#include "nsIServiceManager.h" #include "nsIFrame.h" #include "nsImageFrame.h" #include "nsImageMap.h" diff --git a/accessible/html/HTMLTableAccessible.cpp b/accessible/html/HTMLTableAccessible.cpp index a30d84b88f813..67ef43911c012 100644 --- a/accessible/html/HTMLTableAccessible.cpp +++ b/accessible/html/HTMLTableAccessible.cpp @@ -21,7 +21,6 @@ #include "mozilla/dom/HTMLTableElement.h" #include "nsIHTMLCollection.h" #include "mozilla/dom/Document.h" -#include "nsIMutableArray.h" #include "nsIPersistentProperties2.h" #include "nsITableCellLayout.h" #include "nsFrameSelection.h" diff --git a/accessible/ipc/ProxyAccessibleBase.cpp b/accessible/ipc/ProxyAccessibleBase.cpp index d0264ce86c56e..f7a0a0b631dbf 100644 --- a/accessible/ipc/ProxyAccessibleBase.cpp +++ b/accessible/ipc/ProxyAccessibleBase.cpp @@ -15,7 +15,6 @@ #include "mozilla/dom/BrowserParent.h" #include "mozilla/Unused.h" #include "RelationType.h" -#include "xpcAccessibleDocument.h" namespace mozilla { namespace a11y { diff --git a/accessible/ipc/other/DocAccessibleChild.cpp b/accessible/ipc/other/DocAccessibleChild.cpp index 2c32c6a578162..cc23442e62e7c 100644 --- a/accessible/ipc/other/DocAccessibleChild.cpp +++ b/accessible/ipc/other/DocAccessibleChild.cpp @@ -16,7 +16,6 @@ #include "TableAccessible.h" #include "TableCellAccessible.h" #include "nsIPersistentProperties2.h" -#include "nsISimpleEnumerator.h" #include "nsAccUtils.h" #ifdef MOZ_ACCESSIBILITY_ATK # include "AccessibleWrap.h" diff --git a/accessible/ipc/other/ProxyAccessible.cpp b/accessible/ipc/other/ProxyAccessible.cpp index d2e39a2a2aa8a..f133b2841f4cf 100644 --- a/accessible/ipc/other/ProxyAccessible.cpp +++ b/accessible/ipc/other/ProxyAccessible.cpp @@ -14,7 +14,6 @@ #include "mozilla/a11y/Platform.h" #include "RelationType.h" #include "mozilla/a11y/Role.h" -#include "xpcAccessibleDocument.h" namespace mozilla { namespace a11y { diff --git a/accessible/ipc/win/COMPtrTypes.cpp b/accessible/ipc/win/COMPtrTypes.cpp index 68fdc763aa059..0466b3de1d127 100644 --- a/accessible/ipc/win/COMPtrTypes.cpp +++ b/accessible/ipc/win/COMPtrTypes.cpp @@ -6,7 +6,6 @@ #include "mozilla/a11y/COMPtrTypes.h" -#include "Accessible2_3.h" #include "MainThreadUtils.h" #include "mozilla/a11y/Accessible.h" #include "mozilla/a11y/Platform.h" diff --git a/accessible/ipc/win/ProxyAccessible.cpp b/accessible/ipc/win/ProxyAccessible.cpp index 629b5d17ec52b..9f6280425c300 100644 --- a/accessible/ipc/win/ProxyAccessible.cpp +++ b/accessible/ipc/win/ProxyAccessible.cpp @@ -18,7 +18,6 @@ #include "mozilla/a11y/Platform.h" #include "RelationType.h" #include "mozilla/a11y/Role.h" -#include "xpcAccessibleDocument.h" #include diff --git a/accessible/ipc/win/ProxyAccessible.h b/accessible/ipc/win/ProxyAccessible.h index bb11fc916e49d..64fee1fc246e8 100644 --- a/accessible/ipc/win/ProxyAccessible.h +++ b/accessible/ipc/win/ProxyAccessible.h @@ -10,8 +10,6 @@ #include "Accessible.h" #include "mozilla/a11y/ProxyAccessibleBase.h" #include "mozilla/a11y/Role.h" -#include "nsIAccessibleText.h" -#include "nsIAccessibleTypes.h" #include "nsString.h" #include "nsTArray.h" #include "nsRect.h" diff --git a/accessible/ipc/win/handler/AccessibleHandler.cpp b/accessible/ipc/win/handler/AccessibleHandler.cpp index 39fecd539ec6b..2d60132a136c6 100644 --- a/accessible/ipc/win/handler/AccessibleHandler.cpp +++ b/accessible/ipc/win/handler/AccessibleHandler.cpp @@ -14,7 +14,6 @@ #include "HandlerRelation.h" #include "Factory.h" -#include "HandlerData.h" #include "mozilla/ArrayUtils.h" #include "mozilla/a11y/HandlerDataCleanup.h" #include "mozilla/mscom/Registration.h" diff --git a/accessible/ipc/win/handler/HandlerDataCleanup.h b/accessible/ipc/win/handler/HandlerDataCleanup.h index c96ae4d6a09ec..26d735e78554a 100644 --- a/accessible/ipc/win/handler/HandlerDataCleanup.h +++ b/accessible/ipc/win/handler/HandlerDataCleanup.h @@ -8,7 +8,6 @@ #define mozilla_a11y_HandlerDataCleanup_h #include -#include "HandlerData.h" namespace mozilla { namespace a11y { diff --git a/accessible/mac/mozAccessible.mm b/accessible/mac/mozAccessible.mm index e3a405f7e1719..2aed48fa9f603 100644 --- a/accessible/mac/mozAccessible.mm +++ b/accessible/mac/mozAccessible.mm @@ -10,8 +10,6 @@ #include "Accessible-inl.h" #include "nsAccUtils.h" -#include "nsIAccessibleRelation.h" -#include "nsIAccessibleEditableText.h" #include "nsIPersistentProperties2.h" #include "DocAccessibleParent.h" #include "Relation.h" diff --git a/accessible/windows/ia2/ia2AccessibleHyperlink.cpp b/accessible/windows/ia2/ia2AccessibleHyperlink.cpp index 5d062456fcb20..2943b3e530f4d 100644 --- a/accessible/windows/ia2/ia2AccessibleHyperlink.cpp +++ b/accessible/windows/ia2/ia2AccessibleHyperlink.cpp @@ -5,7 +5,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 "Accessible2.h" #include "AccessibleHyperlink.h" #include "AccessibleHyperlink_i.c" diff --git a/accessible/windows/ia2/ia2AccessibleImage.cpp b/accessible/windows/ia2/ia2AccessibleImage.cpp index 178b704ca80dc..ad198bb7595ab 100644 --- a/accessible/windows/ia2/ia2AccessibleImage.cpp +++ b/accessible/windows/ia2/ia2AccessibleImage.cpp @@ -14,7 +14,6 @@ #include "nsIAccessibleTypes.h" #include "nsString.h" -#include "nsIURI.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/windows/ia2/ia2AccessibleTableCell.cpp b/accessible/windows/ia2/ia2AccessibleTableCell.cpp index 46b99dfb83a52..c1589d0acdffa 100644 --- a/accessible/windows/ia2/ia2AccessibleTableCell.cpp +++ b/accessible/windows/ia2/ia2AccessibleTableCell.cpp @@ -7,7 +7,6 @@ #include "ia2AccessibleTableCell.h" -#include "Accessible2.h" #include "AccessibleTable2_i.c" #include "AccessibleTableCell_i.c" diff --git a/accessible/windows/ia2/ia2AccessibleText.cpp b/accessible/windows/ia2/ia2AccessibleText.cpp index d48c69a31ba75..e6ce80a9664ff 100644 --- a/accessible/windows/ia2/ia2AccessibleText.cpp +++ b/accessible/windows/ia2/ia2AccessibleText.cpp @@ -7,7 +7,6 @@ #include "ia2AccessibleText.h" -#include "Accessible2.h" #include "AccessibleText_i.c" #include "HyperTextAccessibleWrap.h" diff --git a/accessible/windows/ia2/ia2AccessibleText.h b/accessible/windows/ia2/ia2AccessibleText.h index f302535b08607..cd4f1ad5a70c5 100644 --- a/accessible/windows/ia2/ia2AccessibleText.h +++ b/accessible/windows/ia2/ia2AccessibleText.h @@ -8,8 +8,6 @@ #ifndef _ACCESSIBLE_TEXT_H #define _ACCESSIBLE_TEXT_H -#include "nsIAccessibleText.h" - #include "AccessibleText.h" namespace mozilla { diff --git a/accessible/windows/msaa/AccessibleWrap.cpp b/accessible/windows/msaa/AccessibleWrap.cpp index 45cd0a72a6811..3b1541baf77e4 100644 --- a/accessible/windows/msaa/AccessibleWrap.cpp +++ b/accessible/windows/msaa/AccessibleWrap.cpp @@ -30,14 +30,12 @@ # include "Logging.h" #endif -#include "nsIMutableArray.h" #include "nsIFrame.h" #include "nsIScrollableFrame.h" #include "mozilla/PresShell.h" #include "mozilla/dom/NodeInfo.h" #include "mozilla/dom/BrowserBridgeParent.h" #include "mozilla/dom/BrowserParent.h" -#include "nsIServiceManager.h" #include "nsNameSpaceManager.h" #include "nsTextFormatter.h" #include "nsView.h" @@ -46,7 +44,6 @@ #include "nsArrayUtils.h" #include "mozilla/Preferences.h" #include "mozilla/ReverseIterator.h" -#include "nsIXULRuntime.h" #include "mozilla/mscom/AsyncInvoker.h" #include "mozilla/mscom/Interceptor.h" diff --git a/accessible/windows/msaa/AccessibleWrap.h b/accessible/windows/msaa/AccessibleWrap.h index 6b3b9a6d5c9e6..697ef6eb1d7cb 100644 --- a/accessible/windows/msaa/AccessibleWrap.h +++ b/accessible/windows/msaa/AccessibleWrap.h @@ -9,7 +9,6 @@ #include "nsCOMPtr.h" #include "Accessible.h" -#include "Accessible2.h" #include "ia2Accessible.h" #include "ia2AccessibleComponent.h" #include "ia2AccessibleHyperlink.h" diff --git a/accessible/windows/msaa/Compatibility.cpp b/accessible/windows/msaa/Compatibility.cpp index 8bf2a9b489685..f874a5cff8ba5 100644 --- a/accessible/windows/msaa/Compatibility.cpp +++ b/accessible/windows/msaa/Compatibility.cpp @@ -9,6 +9,7 @@ #include "mozilla/WindowsVersion.h" #include "mozilla/WinHeaderOnlyUtils.h" #include "nsExceptionHandler.h" +#include "nsIXULRuntime.h" #include "nsPrintfCString.h" #include "nsUnicharUtils.h" #include "nsWindowsDllInterceptor.h" diff --git a/accessible/windows/msaa/ImageAccessibleWrap.cpp b/accessible/windows/msaa/ImageAccessibleWrap.cpp index f60abaabfbeb9..cdf38f45957d3 100644 --- a/accessible/windows/msaa/ImageAccessibleWrap.cpp +++ b/accessible/windows/msaa/ImageAccessibleWrap.cpp @@ -6,7 +6,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "ImageAccessibleWrap.h" -#include "nsIURI.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/windows/msaa/MsaaIdGenerator.cpp b/accessible/windows/msaa/MsaaIdGenerator.cpp index 60d20dc10236c..f69a43381c136 100644 --- a/accessible/windows/msaa/MsaaIdGenerator.cpp +++ b/accessible/windows/msaa/MsaaIdGenerator.cpp @@ -14,7 +14,6 @@ #include "mozilla/StaticPtr.h" #include "mozilla/Unused.h" #include "nsDataHashtable.h" -#include "nsIXULRuntime.h" #include "sdnAccessible.h" // These constants may be adjusted to modify the proportion of the Child ID diff --git a/accessible/windows/msaa/Platform.cpp b/accessible/windows/msaa/Platform.cpp index 23c4d5df0dfb3..c68d71114fe66 100644 --- a/accessible/windows/msaa/Platform.cpp +++ b/accessible/windows/msaa/Platform.cpp @@ -9,9 +9,7 @@ #include "AccEvent.h" #include "Compatibility.h" #include "HyperTextAccessibleWrap.h" -#include "ia2AccessibleText.h" #include "nsIWindowsRegKey.h" -#include "nsIXULRuntime.h" #include "nsWinUtils.h" #include "mozilla/a11y/ProxyAccessible.h" #include "mozilla/mscom/ActivationContext.h" diff --git a/accessible/windows/msaa/ServiceProvider.cpp b/accessible/windows/msaa/ServiceProvider.cpp index 2216f36be48bf..7b9c8b2ce2e4b 100644 --- a/accessible/windows/msaa/ServiceProvider.cpp +++ b/accessible/windows/msaa/ServiceProvider.cpp @@ -14,7 +14,6 @@ #include "uiaRawElmProvider.h" #include "mozilla/Preferences.h" -#include "nsIDocShell.h" #include "ISimpleDOM.h" diff --git a/accessible/windows/msaa/XULListboxAccessibleWrap.h b/accessible/windows/msaa/XULListboxAccessibleWrap.h index 38863ffdfbd57..9b27edd43d1ad 100644 --- a/accessible/windows/msaa/XULListboxAccessibleWrap.h +++ b/accessible/windows/msaa/XULListboxAccessibleWrap.h @@ -9,7 +9,6 @@ #include "XULListboxAccessible.h" #include "ia2AccessibleTable.h" -#include "ia2AccessibleTableCell.h" namespace mozilla { namespace a11y { diff --git a/accessible/windows/msaa/nsWinUtils.cpp b/accessible/windows/msaa/nsWinUtils.cpp index 44279d0eb845b..a063305b8defc 100644 --- a/accessible/windows/msaa/nsWinUtils.cpp +++ b/accessible/windows/msaa/nsWinUtils.cpp @@ -15,10 +15,8 @@ #include "mozilla/a11y/DocAccessibleParent.h" #include "mozilla/Preferences.h" #include "nsArrayUtils.h" -#include "nsIArray.h" #include "nsICSSDeclaration.h" #include "mozilla/dom/Document.h" -#include "nsIDocShellTreeItem.h" #include "mozilla/dom/Element.h" #include "nsXULAppAPI.h" #include "ProxyWrappers.h" diff --git a/accessible/xpcom/xpcAccessibleHyperLink.cpp b/accessible/xpcom/xpcAccessibleHyperLink.cpp index 5339fadfed0a3..cf3bc33d29f6f 100644 --- a/accessible/xpcom/xpcAccessibleHyperLink.cpp +++ b/accessible/xpcom/xpcAccessibleHyperLink.cpp @@ -5,7 +5,6 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "Accessible-inl.h" -#include "xpcAccessibleDocument.h" #include "nsNetUtil.h" using namespace mozilla::a11y; diff --git a/accessible/xpcom/xpcAccessibleHyperText.cpp b/accessible/xpcom/xpcAccessibleHyperText.cpp index e898ee44fbc47..aec6863c9f691 100644 --- a/accessible/xpcom/xpcAccessibleHyperText.cpp +++ b/accessible/xpcom/xpcAccessibleHyperText.cpp @@ -9,7 +9,6 @@ #include "Accessible-inl.h" #include "HyperTextAccessible-inl.h" #include "TextRange.h" -#include "xpcAccessibleDocument.h" #include "xpcAccessibleTextRange.h" #include "nsIPersistentProperties2.h" diff --git a/accessible/xpcom/xpcAccessibleSelectable.cpp b/accessible/xpcom/xpcAccessibleSelectable.cpp index 1b6874dea376f..e2931fcf939ae 100644 --- a/accessible/xpcom/xpcAccessibleSelectable.cpp +++ b/accessible/xpcom/xpcAccessibleSelectable.cpp @@ -5,7 +5,6 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "Accessible-inl.h" -#include "xpcAccessibleDocument.h" #include "nsIMutableArray.h" diff --git a/accessible/xpcom/xpcAccessibleTable.cpp b/accessible/xpcom/xpcAccessibleTable.cpp index 9a303e7be5c9f..20da22ac8f9dd 100644 --- a/accessible/xpcom/xpcAccessibleTable.cpp +++ b/accessible/xpcom/xpcAccessibleTable.cpp @@ -8,7 +8,6 @@ #include "Accessible.h" #include "TableAccessible.h" -#include "xpcAccessibleDocument.h" #include "nsIMutableArray.h" #include "nsComponentManagerUtils.h" diff --git a/accessible/xpcom/xpcAccessibleTableCell.cpp b/accessible/xpcom/xpcAccessibleTableCell.cpp index fd51efd7f470b..040d4113f51e6 100644 --- a/accessible/xpcom/xpcAccessibleTableCell.cpp +++ b/accessible/xpcom/xpcAccessibleTableCell.cpp @@ -10,7 +10,6 @@ #include "nsIAccessibleTable.h" #include "TableAccessible.h" #include "TableCellAccessible.h" -#include "xpcAccessibleDocument.h" #include "nsComponentManagerUtils.h" #include "nsIMutableArray.h" diff --git a/accessible/xpcom/xpcAccessibleTextRange.cpp b/accessible/xpcom/xpcAccessibleTextRange.cpp index 00d8e57284fab..ed8280a326c63 100644 --- a/accessible/xpcom/xpcAccessibleTextRange.cpp +++ b/accessible/xpcom/xpcAccessibleTextRange.cpp @@ -7,7 +7,6 @@ #include "xpcAccessibleTextRange.h" #include "TextRange-inl.h" -#include "xpcAccessibleDocument.h" #include "nsIMutableArray.h" #include "nsComponentManagerUtils.h" diff --git a/accessible/xul/XULComboboxAccessible.cpp b/accessible/xul/XULComboboxAccessible.cpp index 60eaa50eb57b0..834d739d115e0 100644 --- a/accessible/xul/XULComboboxAccessible.cpp +++ b/accessible/xul/XULComboboxAccessible.cpp @@ -12,9 +12,7 @@ #include "Role.h" #include "States.h" -#include "nsIAutoCompleteInput.h" #include "nsIDOMXULMenuListElement.h" -#include "nsIDOMXULSelectCntrlItemEl.h" using namespace mozilla::a11y; diff --git a/accessible/xul/XULFormControlAccessible.cpp b/accessible/xul/XULFormControlAccessible.cpp index 33409dbe427cd..9ae0abea08607 100644 --- a/accessible/xul/XULFormControlAccessible.cpp +++ b/accessible/xul/XULFormControlAccessible.cpp @@ -9,7 +9,6 @@ #include "HTMLFormControlAccessible.h" #include "nsAccUtils.h" #include "DocAccessible.h" -#include "nsIAccessibleRelation.h" #include "Relation.h" #include "Role.h" #include "States.h" @@ -20,7 +19,6 @@ #include "nsIDOMXULMenuListElement.h" #include "nsIDOMXULRadioGroupElement.h" #include "nsIDOMXULSelectCntrlItemEl.h" -#include "nsIEditor.h" #include "nsIFrame.h" #include "nsITextControlFrame.h" #include "nsMenuPopupFrame.h" diff --git a/accessible/xul/XULListboxAccessible.cpp b/accessible/xul/XULListboxAccessible.cpp index 21a29ea2bf96f..168cbcb5f6ebd 100644 --- a/accessible/xul/XULListboxAccessible.cpp +++ b/accessible/xul/XULListboxAccessible.cpp @@ -13,14 +13,11 @@ #include "States.h" #include "nsComponentManagerUtils.h" -#include "nsIAutoCompleteInput.h" #include "nsIAutoCompletePopup.h" #include "nsIDOMXULMenuListElement.h" #include "nsIDOMXULMultSelectCntrlEl.h" #include "nsIDOMXULSelectCntrlItemEl.h" -#include "nsIMutableArray.h" #include "nsINodeList.h" -#include "nsIPersistentProperties2.h" using namespace mozilla::a11y; diff --git a/accessible/xul/XULListboxAccessible.h b/accessible/xul/XULListboxAccessible.h index eced0c3d54cb0..020a2f1506573 100644 --- a/accessible/xul/XULListboxAccessible.h +++ b/accessible/xul/XULListboxAccessible.h @@ -9,8 +9,6 @@ #include "BaseAccessibles.h" #include "TableAccessible.h" #include "TableCellAccessible.h" -#include "xpcAccessibleTable.h" -#include "xpcAccessibleTableCell.h" #include "XULMenuAccessible.h" #include "XULSelectControlAccessible.h" diff --git a/accessible/xul/XULMenuAccessible.cpp b/accessible/xul/XULMenuAccessible.cpp index f5b1fa029470c..b8a70adcfc03e 100644 --- a/accessible/xul/XULMenuAccessible.cpp +++ b/accessible/xul/XULMenuAccessible.cpp @@ -13,11 +13,8 @@ #include "States.h" #include "XULFormControlAccessible.h" -#include "nsIMutableArray.h" #include "nsIDOMXULContainerElement.h" #include "nsIDOMXULSelectCntrlItemEl.h" -#include "nsIDOMXULMultSelectCntrlEl.h" -#include "nsIServiceManager.h" #include "nsIContent.h" #include "nsMenuBarFrame.h" #include "nsMenuPopupFrame.h" diff --git a/accessible/xul/XULMenuAccessible.h b/accessible/xul/XULMenuAccessible.h index a4cd6faabbfbe..e2891af752dfa 100644 --- a/accessible/xul/XULMenuAccessible.h +++ b/accessible/xul/XULMenuAccessible.h @@ -7,7 +7,6 @@ #define mozilla_a11y_XULMenuAccessible_h__ #include "AccessibleWrap.h" -#include "nsIDOMXULSelectCntrlEl.h" #include "XULSelectControlAccessible.h" namespace mozilla { diff --git a/accessible/xul/XULSelectControlAccessible.cpp b/accessible/xul/XULSelectControlAccessible.cpp index 88fa1ce9dd918..74ec9d3656ee5 100644 --- a/accessible/xul/XULSelectControlAccessible.cpp +++ b/accessible/xul/XULSelectControlAccessible.cpp @@ -11,8 +11,6 @@ #include "nsIDOMXULSelectCntrlItemEl.h" #include "nsIDOMXULMultSelectCntrlEl.h" -#include "nsIMutableArray.h" -#include "nsIServiceManager.h" #include "mozilla/dom/Element.h" #include "mozilla/dom/KeyboardEventBinding.h" diff --git a/accessible/xul/XULSelectControlAccessible.h b/accessible/xul/XULSelectControlAccessible.h index f567aacc0012b..607000904beae 100644 --- a/accessible/xul/XULSelectControlAccessible.h +++ b/accessible/xul/XULSelectControlAccessible.h @@ -8,7 +8,6 @@ #define mozilla_a11y_XULSelectControlAccessible_h__ #include "AccessibleWrap.h" -#include "nsIDOMXULSelectCntrlEl.h" namespace mozilla { namespace a11y { diff --git a/accessible/xul/XULTabAccessible.cpp b/accessible/xul/XULTabAccessible.cpp index 13793cbf7730e..23e3c846ce284 100644 --- a/accessible/xul/XULTabAccessible.cpp +++ b/accessible/xul/XULTabAccessible.cpp @@ -13,7 +13,6 @@ // NOTE: alphabetically ordered #include "mozilla/dom/Document.h" -#include "nsIDOMXULSelectCntrlEl.h" #include "nsIDOMXULSelectCntrlItemEl.h" #include "nsIDOMXULRelatedElement.h" #include "nsXULElement.h" diff --git a/accessible/xul/XULTreeAccessible.cpp b/accessible/xul/XULTreeAccessible.cpp index d7518654bc4c2..5e988861e81f2 100644 --- a/accessible/xul/XULTreeAccessible.cpp +++ b/accessible/xul/XULTreeAccessible.cpp @@ -20,13 +20,9 @@ #include "nsQueryObject.h" #include "nsComponentManagerUtils.h" -#include "nsIAccessibleRelation.h" -#include "nsIAutoCompleteInput.h" #include "nsIAutoCompletePopup.h" #include "nsIDOMXULMenuListElement.h" -#include "nsIDOMXULMultSelectCntrlEl.h" #include "nsITreeSelection.h" -#include "nsIMutableArray.h" #include "nsTreeBodyFrame.h" #include "nsTreeColumns.h" #include "nsTreeUtils.h" diff --git a/accessible/xul/XULTreeGridAccessible.cpp b/accessible/xul/XULTreeGridAccessible.cpp index d03c2ee8cd636..49b6fc98fbd04 100644 --- a/accessible/xul/XULTreeGridAccessible.cpp +++ b/accessible/xul/XULTreeGridAccessible.cpp @@ -16,7 +16,6 @@ #include "nsQueryObject.h" #include "nsTreeColumns.h" -#include "nsIMutableArray.h" #include "nsPersistentProperties.h" #include "nsITreeSelection.h" #include "nsComponentManagerUtils.h" diff --git a/accessible/xul/XULTreeGridAccessible.h b/accessible/xul/XULTreeGridAccessible.h index 05962b5c4704e..2e4be63dde62f 100644 --- a/accessible/xul/XULTreeGridAccessible.h +++ b/accessible/xul/XULTreeGridAccessible.h @@ -9,8 +9,6 @@ #include "XULTreeAccessible.h" #include "TableAccessible.h" #include "TableCellAccessible.h" -#include "xpcAccessibleTable.h" -#include "xpcAccessibleTableCell.h" namespace mozilla { namespace a11y { diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp index 8d96a3ee6a420..008840f30a85c 100644 --- a/browser/app/nsBrowserApp.cpp +++ b/browser/app/nsBrowserApp.cpp @@ -21,7 +21,6 @@ #include #include "nsCOMPtr.h" -#include "nsIFile.h" #ifdef XP_WIN # include "LauncherProcessWin.h" diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp index f56465cde1e49..a57b383d55652 100644 --- a/browser/components/about/AboutRedirector.cpp +++ b/browser/components/about/AboutRedirector.cpp @@ -10,7 +10,6 @@ #include "nsIAboutNewTabService.h" #include "nsIChannel.h" #include "nsIURI.h" -#include "nsIScriptSecurityManager.h" #include "nsIProtocolHandler.h" #include "mozilla/ArrayUtils.h" #include "mozilla/Preferences.h" diff --git a/browser/components/dirprovider/DirectoryProvider.cpp b/browser/components/dirprovider/DirectoryProvider.cpp index d1c4c7800e767..6a39edb410809 100644 --- a/browser/components/dirprovider/DirectoryProvider.cpp +++ b/browser/components/dirprovider/DirectoryProvider.cpp @@ -2,7 +2,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 "nsIDirectoryService.h" #include "DirectoryProvider.h" #include "nsIFile.h" @@ -23,7 +22,6 @@ #include "nsServiceManagerUtils.h" #include "nsString.h" #include "nsXULAppAPI.h" -#include "nsIPrefLocalizedString.h" using mozilla::intl::LocaleService; diff --git a/browser/components/dirprovider/DirectoryProvider.h b/browser/components/dirprovider/DirectoryProvider.h index e2c1ffdb0c734..78682e940727e 100644 --- a/browser/components/dirprovider/DirectoryProvider.h +++ b/browser/components/dirprovider/DirectoryProvider.h @@ -7,7 +7,6 @@ #include "nsIDirectoryService.h" #include "nsComponentManagerUtils.h" -#include "nsIFile.h" #include "nsSimpleEnumerator.h" #include "mozilla/Attributes.h" diff --git a/browser/components/migration/nsIEHistoryEnumerator.cpp b/browser/components/migration/nsIEHistoryEnumerator.cpp index 58aa1fee280c1..da5884201363e 100644 --- a/browser/components/migration/nsIEHistoryEnumerator.cpp +++ b/browser/components/migration/nsIEHistoryEnumerator.cpp @@ -8,9 +8,9 @@ #include #include "nsArrayEnumerator.h" +#include "nsComponentManagerUtils.h" #include "nsCOMArray.h" #include "nsIURI.h" -#include "nsIVariant.h" #include "nsNetUtil.h" #include "nsString.h" #include "nsWindowsMigrationUtils.h" diff --git a/browser/components/shell/nsGNOMEShellService.cpp b/browser/components/shell/nsGNOMEShellService.cpp index ecbfd9c557f5e..5b022281a2114 100644 --- a/browser/components/shell/nsGNOMEShellService.cpp +++ b/browser/components/shell/nsGNOMEShellService.cpp @@ -8,17 +8,14 @@ #include "nsCOMPtr.h" #include "nsGNOMEShellService.h" #include "nsShellService.h" -#include "nsIServiceManager.h" #include "nsIFile.h" #include "nsIProperties.h" #include "nsDirectoryServiceDefs.h" -#include "nsIPrefService.h" #include "prenv.h" #include "nsString.h" #include "nsIGIOService.h" #include "nsIGSettingsService.h" #include "nsIStringBundle.h" -#include "nsIOutputStream.h" #include "nsServiceManagerUtils.h" #include "nsComponentManagerUtils.h" #include "nsIImageLoadingContent.h" diff --git a/browser/components/shell/nsMacShellService.cpp b/browser/components/shell/nsMacShellService.cpp index f968614f74b29..a4265f79d4dbe 100644 --- a/browser/components/shell/nsMacShellService.cpp +++ b/browser/components/shell/nsMacShellService.cpp @@ -8,10 +8,6 @@ #include "mozilla/dom/Document.h" #include "nsIContent.h" #include "nsIObserverService.h" -#include "nsIPrefService.h" -#include "nsIServiceManager.h" -#include "nsIStringBundle.h" -#include "nsIURL.h" #include "nsIWebBrowserPersist.h" #include "nsMacShellService.h" #include "nsIProperties.h" diff --git a/browser/components/shell/nsWindowsShellService.cpp b/browser/components/shell/nsWindowsShellService.cpp index 5154858163b84..e0076d4b9e81d 100644 --- a/browser/components/shell/nsWindowsShellService.cpp +++ b/browser/components/shell/nsWindowsShellService.cpp @@ -13,14 +13,10 @@ #include "nsIContent.h" #include "nsIImageLoadingContent.h" #include "nsIOutputStream.h" -#include "nsIPrefService.h" -#include "nsIPrefLocalizedString.h" -#include "nsIServiceManager.h" #include "nsIStringBundle.h" #include "nsNetUtil.h" #include "nsServiceManagerUtils.h" #include "nsShellService.h" -#include "nsICategoryManager.h" #include "nsDirectoryServiceUtils.h" #include "nsAppDirectoryServiceDefs.h" #include "nsDirectoryServiceDefs.h" diff --git a/caps/BasePrincipal.cpp b/caps/BasePrincipal.cpp index c668a19088dc9..81fe93299d271 100644 --- a/caps/BasePrincipal.cpp +++ b/caps/BasePrincipal.cpp @@ -7,9 +7,6 @@ #include "mozilla/BasePrincipal.h" #include "nsDocShell.h" -#include "nsIObjectInputStream.h" -#include "nsIObjectOutputStream.h" -#include "nsIStandardURL.h" #include "ExpandedPrincipal.h" #include "nsNetUtil.h" diff --git a/caps/ContentPrincipal.h b/caps/ContentPrincipal.h index 14ae076b68147..55855537871f7 100644 --- a/caps/ContentPrincipal.h +++ b/caps/ContentPrincipal.h @@ -9,8 +9,6 @@ #include "nsCOMPtr.h" #include "nsJSPrincipals.h" #include "nsTArray.h" -#include "nsIContentSecurityPolicy.h" -#include "nsIProtocolHandler.h" #include "nsNetUtil.h" #include "nsScriptSecurityManager.h" #include "mozilla/BasePrincipal.h" diff --git a/caps/DomainPolicy.cpp b/caps/DomainPolicy.cpp index 632f82dbe83e4..48dc4f8ca2684 100644 --- a/caps/DomainPolicy.cpp +++ b/caps/DomainPolicy.cpp @@ -8,8 +8,6 @@ #include "mozilla/dom/ContentParent.h" #include "mozilla/ipc/URIUtils.h" #include "mozilla/Unused.h" -#include "nsIMessageManager.h" -#include "nsIURIMutator.h" #include "nsScriptSecurityManager.h" namespace mozilla { diff --git a/caps/NullPrincipal.cpp b/caps/NullPrincipal.cpp index cf3d9468bb26f..6d36fb0622aba 100644 --- a/caps/NullPrincipal.cpp +++ b/caps/NullPrincipal.cpp @@ -19,7 +19,6 @@ #include "nsIClassInfoImpl.h" #include "nsNetCID.h" #include "nsError.h" -#include "nsIScriptSecurityManager.h" #include "ContentPrincipal.h" #include "nsScriptSecurityManager.h" #include "pratom.h" diff --git a/caps/NullPrincipal.h b/caps/NullPrincipal.h index 0196716eb7a45..2019b3e1d54ae 100644 --- a/caps/NullPrincipal.h +++ b/caps/NullPrincipal.h @@ -14,7 +14,6 @@ #include "nsIPrincipal.h" #include "nsJSPrincipals.h" -#include "nsIScriptSecurityManager.h" #include "nsCOMPtr.h" #include "mozilla/BasePrincipal.h" diff --git a/caps/SystemPrincipal.cpp b/caps/SystemPrincipal.cpp index b5c3c9337013e..075d827a0b81c 100644 --- a/caps/SystemPrincipal.cpp +++ b/caps/SystemPrincipal.cpp @@ -7,15 +7,11 @@ #include "nscore.h" #include "SystemPrincipal.h" -#include "nsIComponentManager.h" -#include "nsIServiceManager.h" -#include "nsIURL.h" #include "nsCOMPtr.h" #include "nsReadableUtils.h" #include "nsCRT.h" #include "nsString.h" #include "nsIClassInfoImpl.h" -#include "nsIScriptSecurityManager.h" #include "pratom.h" using namespace mozilla; diff --git a/caps/nsJSPrincipals.cpp b/caps/nsJSPrincipals.cpp index fc1915f123b7b..dadb3f84d4acc 100644 --- a/caps/nsJSPrincipals.cpp +++ b/caps/nsJSPrincipals.cpp @@ -5,12 +5,9 @@ #include "xpcpublic.h" #include "nsString.h" -#include "nsIObjectOutputStream.h" -#include "nsIObjectInputStream.h" #include "nsJSPrincipals.h" #include "plstr.h" #include "nsCOMPtr.h" -#include "nsIServiceManager.h" #include "nsMemory.h" #include "nsStringBuffer.h" #include "mozilla/BasePrincipal.h" diff --git a/caps/nsScriptSecurityManager.cpp b/caps/nsScriptSecurityManager.cpp index 8df6f7d6d8b1f..7f9b704176521 100644 --- a/caps/nsScriptSecurityManager.cpp +++ b/caps/nsScriptSecurityManager.cpp @@ -13,14 +13,10 @@ #include "xpcpublic.h" #include "XPCWrapper.h" -#include "nsIInputStreamChannel.h" #include "nsILoadContext.h" -#include "nsIServiceManager.h" #include "nsIScriptObjectPrincipal.h" #include "nsIScriptContext.h" #include "nsIScriptError.h" -#include "nsIURL.h" -#include "nsIURIMutator.h" #include "nsINestedURI.h" #include "nspr.h" #include "nsJSPrincipals.h" @@ -40,16 +36,10 @@ #include "nsIStringBundle.h" #include "nsNetUtil.h" #include "nsIEffectiveTLDService.h" -#include "nsIProperties.h" #include "nsDirectoryServiceDefs.h" -#include "nsIFile.h" -#include "nsIFileURL.h" -#include "nsIZipReader.h" #include "nsIScriptGlobalObject.h" #include "nsPIDOMWindow.h" #include "nsIDocShell.h" -#include "nsIPrompt.h" -#include "nsIWindowWatcher.h" #include "nsIConsoleService.h" #include "nsIOService.h" #include "nsIContent.h" @@ -60,7 +50,6 @@ #include "nsIChromeRegistry.h" #include "nsIResProtocolHandler.h" #include "nsIContentSecurityPolicy.h" -#include "nsIAsyncVerifyRedirectCallback.h" #include "mozilla/Components.h" #include "mozilla/Preferences.h" #include "mozilla/dom/BindingUtils.h" @@ -75,8 +64,6 @@ #include "nsContentUtils.h" #include "nsJSUtils.h" #include "nsILoadInfo.h" -#include "nsIDOMXULCommandDispatcher.h" -#include "nsITreeSelection.h" // This should be probably defined on some other place... but I couldn't find it #define WEBAPPS_PERM_NAME "webapps-manage" diff --git a/chrome/nsChromeProtocolHandler.cpp b/chrome/nsChromeProtocolHandler.cpp index be7bb578f4d9e..9edbbdeafe4eb 100644 --- a/chrome/nsChromeProtocolHandler.cpp +++ b/chrome/nsChromeProtocolHandler.cpp @@ -19,9 +19,6 @@ #include "nsIChromeRegistry.h" #include "nsIFile.h" #include "nsIFileChannel.h" -#include "nsIIOService.h" -#include "nsILoadGroup.h" -#include "nsIScriptSecurityManager.h" #include "nsIStandardURL.h" #include "nsNetUtil.h" #include "nsNetCID.h" diff --git a/chrome/nsChromeRegistry.cpp b/chrome/nsChromeRegistry.cpp index 53036468dd67e..085a3c48ac18b 100644 --- a/chrome/nsChromeRegistry.cpp +++ b/chrome/nsChromeRegistry.cpp @@ -20,15 +20,12 @@ #include "mozilla/dom/Document.h" #include "nsIObserverService.h" #include "nsIScriptError.h" -#include "nsIWindowMediator.h" -#include "nsIPrefService.h" #include "mozilla/Preferences.h" #include "mozilla/PresShell.h" #include "mozilla/Printf.h" #include "mozilla/StyleSheet.h" #include "mozilla/StyleSheetInlines.h" #include "mozilla/dom/Location.h" -#include "nsIURIMutator.h" #include "unicode/uloc.h" diff --git a/chrome/nsChromeRegistryChrome.cpp b/chrome/nsChromeRegistryChrome.cpp index 6463e0aed89f0..41c559152f226 100644 --- a/chrome/nsChromeRegistryChrome.cpp +++ b/chrome/nsChromeRegistryChrome.cpp @@ -29,8 +29,6 @@ #include "nsIAppStartup.h" #include "nsIObserverService.h" -#include "nsIPrefBranch.h" -#include "nsIPrefService.h" #include "mozilla/Preferences.h" #include "nsIResProtocolHandler.h" #include "nsIScriptError.h" diff --git a/chrome/nsChromeRegistryContent.cpp b/chrome/nsChromeRegistryContent.cpp index a0b0f21600b21..fbf4ac2212757 100644 --- a/chrome/nsChromeRegistryContent.cpp +++ b/chrome/nsChromeRegistryContent.cpp @@ -8,7 +8,6 @@ #include "nsChromeRegistryContent.h" #include "nsString.h" #include "nsNetUtil.h" -#include "nsIResProtocolHandler.h" nsChromeRegistryContent::nsChromeRegistryContent() {} diff --git a/devtools/platform/nsJSInspector.cpp b/devtools/platform/nsJSInspector.cpp index 33924a209a3c9..aa74a1ed3d642 100644 --- a/devtools/platform/nsJSInspector.cpp +++ b/devtools/platform/nsJSInspector.cpp @@ -4,7 +4,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsJSInspector.h" -#include "nsIXPConnect.h" #include "nsThreadUtils.h" #include "jsfriendapi.h" #include "mozilla/HoldDropJSObjects.h" diff --git a/docshell/base/CanonicalBrowsingContext.h b/docshell/base/CanonicalBrowsingContext.h index 7b71186297370..b34f35c12c01d 100644 --- a/docshell/base/CanonicalBrowsingContext.h +++ b/docshell/base/CanonicalBrowsingContext.h @@ -17,8 +17,6 @@ #include "nsHashKeys.h" #include "nsISHistory.h" -class nsIDocShell; - namespace mozilla { namespace dom { diff --git a/docshell/base/nsCTooltipTextProvider.h b/docshell/base/nsCTooltipTextProvider.h index 95fb004322850..731edf1170b69 100644 --- a/docshell/base/nsCTooltipTextProvider.h +++ b/docshell/base/nsCTooltipTextProvider.h @@ -7,8 +7,6 @@ #ifndef NSCTOOLTIPTEXTPROVIDER_H #define NSCTOOLTIPTEXTPROVIDER_H -#include "nsITooltipTextProvider.h" - #define NS_TOOLTIPTEXTPROVIDER_CONTRACTID \ "@mozilla.org/embedcomp/tooltiptextprovider;1" #define NS_DEFAULTTOOLTIPTEXTPROVIDER_CONTRACTID \ diff --git a/docshell/base/nsDSURIContentListener.cpp b/docshell/base/nsDSURIContentListener.cpp index 1bc5478757063..3c5bd84c4e1c8 100644 --- a/docshell/base/nsDSURIContentListener.cpp +++ b/docshell/base/nsDSURIContentListener.cpp @@ -11,7 +11,6 @@ #include "nsDocShellCID.h" #include "nsIWebNavigationInfo.h" #include "mozilla/dom/Document.h" -#include "nsIHttpChannel.h" #include "nsError.h" #include "nsContentSecurityManager.h" #include "nsDocShellLoadTypes.h" diff --git a/docshell/base/nsDefaultURIFixup.cpp b/docshell/base/nsDefaultURIFixup.cpp index 81b077121bc49..0341d51f8c028 100644 --- a/docshell/base/nsDefaultURIFixup.cpp +++ b/docshell/base/nsDefaultURIFixup.cpp @@ -23,7 +23,6 @@ #include "mozilla/TextUtils.h" #include "mozilla/Tokenizer.h" #include "mozilla/Unused.h" -#include "nsIObserverService.h" #include "nsXULAppAPI.h" #include "mozilla/StaticPrefs_browser.h" #include "mozilla/StaticPrefs_keyword.h" diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index fc23dd1197c05..9045bc1b2619b 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -79,7 +79,6 @@ #include "nsIApplicationCacheChannel.h" #include "nsIApplicationCacheContainer.h" #include "nsIAppShell.h" -#include "nsIAsyncVerifyRedirectCallback.h" #include "nsIAuthPrompt.h" #include "nsIAuthPrompt2.h" #include "nsICachingChannel.h" @@ -93,7 +92,6 @@ #include "nsIContentSecurityPolicy.h" #include "nsIContentViewer.h" #include "nsIController.h" -#include "nsICookieService.h" #include "nsIDocShellTreeItem.h" #include "nsIDocShellTreeOwner.h" #include "mozilla/dom/Document.h" @@ -109,7 +107,6 @@ #include "nsIIDNService.h" #include "nsIInputStreamChannel.h" #include "nsIInterfaceRequestorUtils.h" -#include "nsIJARChannel.h" #include "nsILayoutHistoryState.h" #include "nsILoadInfo.h" #include "nsIMultiPartChannel.h" @@ -130,16 +127,13 @@ #include "nsIScrollableFrame.h" #include "nsIScrollObserver.h" #include "nsISecureBrowserUI.h" -#include "nsISecurityUITelemetry.h" #include "nsISeekableStream.h" #include "nsISelectionDisplay.h" #include "nsISHEntry.h" -#include "nsISHistory.h" #include "nsISiteSecurityService.h" #include "nsISocketProvider.h" #include "nsIStringBundle.h" #include "nsIStructuredCloneContainer.h" -#include "nsISupportsPrimitives.h" #include "nsIBrowserChild.h" #include "nsITextToSubURI.h" #include "nsITimedChannel.h" @@ -148,8 +142,6 @@ #include "nsIUploadChannel.h" #include "nsIURIFixup.h" #include "nsIURILoader.h" -#include "nsIURIMutator.h" -#include "nsIURL.h" #include "nsIViewSourceChannel.h" #include "nsIWebBrowserChrome.h" #include "nsIWebBrowserChrome3.h" @@ -167,8 +159,6 @@ #include "IHistory.h" #include "IUrlClassifierUITelemetry.h" -#include "mozIThirdPartyUtil.h" - #include "nsArray.h" #include "nsArrayUtils.h" #include "nsAutoPtr.h" diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h index e69bc03ddaf20..bc92b7fea880e 100644 --- a/docshell/base/nsDocShell.h +++ b/docshell/base/nsDocShell.h @@ -35,7 +35,6 @@ #include "nsINetworkInterceptController.h" #include "nsIRefreshURI.h" #include "nsIScrollable.h" -#include "nsIRemoteTab.h" #include "nsIWebNavigation.h" #include "nsIWebPageDescriptor.h" #include "nsIWebProgressListener.h" diff --git a/docshell/base/nsDocShellEditorData.cpp b/docshell/base/nsDocShellEditorData.cpp index 4bcd4cdb110d5..916b7d0d98dfa 100644 --- a/docshell/base/nsDocShellEditorData.cpp +++ b/docshell/base/nsDocShellEditorData.cpp @@ -8,7 +8,6 @@ #include "nsIInterfaceRequestorUtils.h" #include "nsComponentManagerUtils.h" #include "nsPIDOMWindow.h" -#include "nsIEditor.h" #include "nsEditingSession.h" #include "nsIDocShell.h" diff --git a/docshell/base/nsDocShellLoadState.cpp b/docshell/base/nsDocShellLoadState.cpp index a356fbedcccf3..d87a3d4b7bf5c 100644 --- a/docshell/base/nsDocShellLoadState.cpp +++ b/docshell/base/nsDocShellLoadState.cpp @@ -10,7 +10,6 @@ #include "SHEntryChild.h" #include "nsISHEntry.h" #include "nsIDocShellTreeItem.h" -#include "nsIScriptSecurityManager.h" #include "nsIWebNavigation.h" #include "nsIChildChannel.h" #include "ReferrerInfo.h" diff --git a/docshell/base/nsDocShellTreeOwner.cpp b/docshell/base/nsDocShellTreeOwner.cpp index dfc5245c28c36..0f896c1c73fdc 100644 --- a/docshell/base/nsDocShellTreeOwner.cpp +++ b/docshell/base/nsDocShellTreeOwner.cpp @@ -12,13 +12,11 @@ #include "nsContentUtils.h" #include "nsSize.h" #include "mozilla/ReflowInput.h" -#include "nsIServiceManager.h" #include "nsComponentManagerUtils.h" #include "nsString.h" #include "nsAtom.h" #include "nsReadableUtils.h" #include "nsUnicharUtils.h" -#include "nsISimpleEnumerator.h" #include "mozilla/LookAndFeel.h" // Interfaces needed to be included @@ -30,9 +28,7 @@ #include "mozilla/dom/MouseEvent.h" #include "mozilla/dom/SVGTitleElement.h" #include "nsIFormControl.h" -#include "nsIImageLoadingContent.h" #include "nsIWebNavigation.h" -#include "nsIStringBundle.h" #include "nsPIDOMWindow.h" #include "nsPIWindowRoot.h" #include "nsIWindowWatcher.h" @@ -43,7 +39,6 @@ #include "nsRect.h" #include "nsIWebBrowserChromeFocus.h" #include "nsIContent.h" -#include "imgIContainer.h" #include "nsViewManager.h" #include "nsView.h" #include "nsIConstraintValidation.h" diff --git a/docshell/base/nsDocShellTreeOwner.h b/docshell/base/nsDocShellTreeOwner.h index 0341eda724dda..eb7ad95288d68 100644 --- a/docshell/base/nsDocShellTreeOwner.h +++ b/docshell/base/nsDocShellTreeOwner.h @@ -24,10 +24,8 @@ #include "nsITimer.h" #include "nsIPrompt.h" #include "nsIAuthPrompt.h" -#include "nsITooltipListener.h" #include "nsITooltipTextProvider.h" #include "nsCTooltipTextProvider.h" -#include "nsIDroppedLinkHandler.h" namespace mozilla { namespace dom { @@ -36,6 +34,7 @@ class EventTarget; } // namespace dom } // namespace mozilla +class nsIDocShellTreeItem; class nsWebBrowser; class ChromeTooltipListener; diff --git a/docshell/shistory/ChildSHistory.cpp b/docshell/shistory/ChildSHistory.cpp index 713f4a4566ca5..415070fef9a32 100644 --- a/docshell/shistory/ChildSHistory.cpp +++ b/docshell/shistory/ChildSHistory.cpp @@ -11,12 +11,10 @@ #include "mozilla/dom/SHEntryChild.h" #include "mozilla/dom/SHistoryChild.h" #include "mozilla/StaticPrefs_fission.h" -#include "nsIMessageManager.h" #include "nsComponentManagerUtils.h" #include "nsSHEntry.h" #include "nsSHistory.h" #include "nsDocShell.h" -#include "nsISHEntry.h" #include "nsXULAppAPI.h" namespace mozilla { diff --git a/docshell/shistory/nsSHEntryShared.cpp b/docshell/shistory/nsSHEntryShared.cpp index 7680a88598577..7a13e95193089 100644 --- a/docshell/shistory/nsSHEntryShared.cpp +++ b/docshell/shistory/nsSHEntryShared.cpp @@ -9,8 +9,6 @@ #include "nsArray.h" #include "nsDocShellEditorData.h" #include "nsIContentViewer.h" -#include "nsIDocShell.h" -#include "nsIDocShellTreeItem.h" #include "mozilla/dom/Document.h" #include "nsILayoutHistoryState.h" #include "nsIWebNavigation.h" diff --git a/editor/composer/ComposerCommandsUpdater.cpp b/editor/composer/ComposerCommandsUpdater.cpp index e497c9a13a3ad..346b318790cbb 100644 --- a/editor/composer/ComposerCommandsUpdater.cpp +++ b/editor/composer/ComposerCommandsUpdater.cpp @@ -15,7 +15,6 @@ #include "nsDebug.h" // for NS_ENSURE_TRUE, etc #include "nsError.h" // for NS_OK, NS_ERROR_FAILURE, etc #include "nsID.h" // for NS_GET_IID, etc -#include "nsIDocShell.h" // for nsIDocShell #include "nsIInterfaceRequestorUtils.h" // for do_GetInterface #include "nsITransactionManager.h" // for nsITransactionManager #include "nsLiteralString.h" // for NS_LITERAL_STRING diff --git a/editor/composer/nsEditingSession.cpp b/editor/composer/nsEditingSession.cpp index 1f21f7f72f5d2..30a95cd8aaa2a 100644 --- a/editor/composer/nsEditingSession.cpp +++ b/editor/composer/nsEditingSession.cpp @@ -19,22 +19,20 @@ #include "nsContentUtils.h" #include "nsDebug.h" // for NS_ENSURE_SUCCESS, etc #include "nsEditingSession.h" -#include "nsError.h" // for NS_ERROR_FAILURE, NS_OK, etc -#include "nsIChannel.h" // for nsIChannel -#include "nsIContentViewer.h" // for nsIContentViewer -#include "nsIControllers.h" // for nsIControllers -#include "nsID.h" // for NS_GET_IID, etc -#include "nsHTMLDocument.h" // for nsHTMLDocument -#include "nsIDocShell.h" // for nsIDocShell -#include "mozilla/dom/Document.h" // for Document -#include "nsIDocumentStateListener.h" +#include "nsError.h" // for NS_ERROR_FAILURE, NS_OK, etc +#include "nsIChannel.h" // for nsIChannel +#include "nsIContentViewer.h" // for nsIContentViewer +#include "nsIControllers.h" // for nsIControllers +#include "nsID.h" // for NS_GET_IID, etc +#include "nsHTMLDocument.h" // for nsHTMLDocument +#include "nsIDocShell.h" // for nsIDocShell +#include "mozilla/dom/Document.h" // for Document #include "nsIEditor.h" // for nsIEditor #include "nsIInterfaceRequestorUtils.h" // for do_GetInterface #include "nsIPlaintextEditor.h" // for nsIPlaintextEditor, etc #include "nsIRefreshURI.h" // for nsIRefreshURI #include "nsIRequest.h" // for nsIRequest #include "nsITimer.h" // for nsITimer, etc -#include "nsITransactionManager.h" // for nsITransactionManager #include "nsIWeakReference.h" // for nsISupportsWeakReference, etc #include "nsIWebNavigation.h" // for nsIWebNavigation #include "nsIWebProgress.h" // for nsIWebProgress, etc diff --git a/editor/libeditor/CSSEditUtils.cpp b/editor/libeditor/CSSEditUtils.cpp index 8677188259c47..b96243ed9a7a8 100644 --- a/editor/libeditor/CSSEditUtils.cpp +++ b/editor/libeditor/CSSEditUtils.cpp @@ -25,7 +25,6 @@ #include "nsIContent.h" #include "nsICSSDeclaration.h" #include "mozilla/dom/Document.h" -#include "nsIEditor.h" #include "nsINode.h" #include "nsISupportsImpl.h" #include "nsISupportsUtils.h" diff --git a/editor/libeditor/CreateElementTransaction.cpp b/editor/libeditor/CreateElementTransaction.cpp index a245d3fb1c0ad..a4fa89b9e054b 100644 --- a/editor/libeditor/CreateElementTransaction.cpp +++ b/editor/libeditor/CreateElementTransaction.cpp @@ -20,7 +20,6 @@ #include "nsDebug.h" #include "nsError.h" #include "nsIContent.h" -#include "nsIEditor.h" #include "nsINode.h" #include "nsISupportsUtils.h" #include "nsMemory.h" diff --git a/editor/libeditor/DeleteTextTransaction.cpp b/editor/libeditor/DeleteTextTransaction.cpp index e1d689ae45a56..464cc549a8a40 100644 --- a/editor/libeditor/DeleteTextTransaction.cpp +++ b/editor/libeditor/DeleteTextTransaction.cpp @@ -12,7 +12,6 @@ #include "mozilla/dom/Selection.h" #include "nsDebug.h" #include "nsError.h" -#include "nsIEditor.h" #include "nsISupportsImpl.h" #include "nsAString.h" diff --git a/editor/libeditor/EditorBase.cpp b/editor/libeditor/EditorBase.cpp index 8e457a6abebca..3385c334cf38d 100644 --- a/editor/libeditor/EditorBase.cpp +++ b/editor/libeditor/EditorBase.cpp @@ -79,11 +79,9 @@ #include "nsAtom.h" // for nsAtom #include "nsIContent.h" // for nsIContent #include "mozilla/dom/Document.h" // for Document -#include "nsIDOMEventListener.h" // for nsIDOMEventListener #include "nsIDocumentStateListener.h" // for nsIDocumentStateListener #include "nsIEditActionListener.h" // for nsIEditActionListener #include "nsIEditorObserver.h" // for nsIEditorObserver -#include "nsIEditorSpellCheck.h" // for nsIEditorSpellCheck #include "nsIFrame.h" // for nsIFrame #include "nsIInlineSpellChecker.h" // for nsIInlineSpellChecker, etc. #include "nsNameSpaceManager.h" // for kNameSpaceID_None, etc. diff --git a/editor/libeditor/EditorBase.h b/editor/libeditor/EditorBase.h index c172f9cb7a320..ece0ab9308eae 100644 --- a/editor/libeditor/EditorBase.h +++ b/editor/libeditor/EditorBase.h @@ -28,7 +28,6 @@ #include "mozilla/dom/Document.h" #include "nsIContentInlines.h" // for nsINode::IsEditable() #include "nsIEditor.h" // for nsIEditor, etc. -#include "nsIObserver.h" // for NS_DECL_NSIOBSERVER, etc. #include "nsIPlaintextEditor.h" // for nsIPlaintextEditor, etc. #include "nsISelectionController.h" // for nsISelectionController constants #include "nsISelectionListener.h" // for nsISelectionListener diff --git a/editor/libeditor/EditorEventListener.cpp b/editor/libeditor/EditorEventListener.cpp index 834610e6123e0..ecd2063a42277 100644 --- a/editor/libeditor/EditorEventListener.cpp +++ b/editor/libeditor/EditorEventListener.cpp @@ -27,24 +27,20 @@ #include "nsDebug.h" // for NS_ENSURE_TRUE, etc. #include "nsFocusManager.h" // for nsFocusManager #include "nsGkAtoms.h" // for nsGkAtoms, nsGkAtoms::input -#include "nsIClipboard.h" // for nsIClipboard, etc. #include "nsIContent.h" // for nsIContent #include "nsIController.h" // for nsIController #include "nsID.h" #include "mozilla/dom/DOMStringList.h" #include "mozilla/dom/DataTransfer.h" #include "mozilla/dom/DragEvent.h" -#include "mozilla/dom/Document.h" // for Document -#include "nsIFocusManager.h" // for nsIFocusManager -#include "nsIFormControl.h" // for nsIFormControl, etc. -#include "nsINode.h" // for nsINode, ::NODE_IS_EDITABLE, etc. -#include "nsIPlaintextEditor.h" // for nsIPlaintextEditor, etc. -#include "nsISelectionController.h" // for nsISelectionController, etc. -#include "nsITransferable.h" // for kFileMime, kHTMLMime, etc. -#include "nsIWidget.h" // for nsIWidget -#include "nsLiteralString.h" // for NS_LITERAL_STRING -#include "nsPIWindowRoot.h" // for nsPIWindowRoot -#include "nsPrintfCString.h" // for nsPrintfCString +#include "mozilla/dom/Document.h" // for Document +#include "nsIFormControl.h" // for nsIFormControl, etc. +#include "nsINode.h" // for nsINode, ::NODE_IS_EDITABLE, etc. +#include "nsIPlaintextEditor.h" // for nsIPlaintextEditor, etc. +#include "nsIWidget.h" // for nsIWidget +#include "nsLiteralString.h" // for NS_LITERAL_STRING +#include "nsPIWindowRoot.h" // for nsPIWindowRoot +#include "nsPrintfCString.h" // for nsPrintfCString #include "nsRange.h" #include "nsServiceManagerUtils.h" // for do_GetService #include "nsString.h" // for nsAutoString diff --git a/editor/libeditor/EditorUtils.cpp b/editor/libeditor/EditorUtils.cpp index 8f6d284530279..8fd920885bf3b 100644 --- a/editor/libeditor/EditorUtils.cpp +++ b/editor/libeditor/EditorUtils.cpp @@ -15,7 +15,6 @@ #include "nsComponentManagerUtils.h" #include "nsError.h" #include "nsIContent.h" -#include "nsIDocShell.h" #include "mozilla/dom/Document.h" #include "nsIInterfaceRequestorUtils.h" #include "nsINode.h" diff --git a/editor/libeditor/EditorUtils.h b/editor/libeditor/EditorUtils.h index 6369f6f89c229..0371b0b1b24b2 100644 --- a/editor/libeditor/EditorUtils.h +++ b/editor/libeditor/EditorUtils.h @@ -16,7 +16,6 @@ #include "mozilla/dom/StaticRange.h" #include "nsCOMPtr.h" #include "nsDebug.h" -#include "nsIEditor.h" #include "nsRange.h" #include "nscore.h" diff --git a/editor/libeditor/HTMLAbsPositionEditor.cpp b/editor/libeditor/HTMLAbsPositionEditor.cpp index 99cb0bfd55cae..64fe0c85850c7 100644 --- a/editor/libeditor/HTMLAbsPositionEditor.cpp +++ b/editor/libeditor/HTMLAbsPositionEditor.cpp @@ -24,8 +24,6 @@ #include "nsGkAtoms.h" #include "nsIContent.h" #include "nsROCSSPrimitiveValue.h" -#include "nsIDOMEventListener.h" -#include "nsIHTMLObjectResizer.h" #include "nsINode.h" #include "nsIPrincipal.h" #include "nsISupportsImpl.h" diff --git a/editor/libeditor/HTMLAnonymousNodeEditor.cpp b/editor/libeditor/HTMLAnonymousNodeEditor.cpp index 0c186ef744689..fa9b593d284fa 100644 --- a/editor/libeditor/HTMLAnonymousNodeEditor.cpp +++ b/editor/libeditor/HTMLAnonymousNodeEditor.cpp @@ -23,9 +23,6 @@ #include "nsID.h" #include "mozilla/dom/Document.h" #include "nsIDocumentObserver.h" -#include "nsIHTMLAbsPosEditor.h" -#include "nsIHTMLInlineTableEditor.h" -#include "nsIHTMLObjectResizer.h" #include "nsStubMutationObserver.h" #include "nsINode.h" #include "nsISupportsImpl.h" diff --git a/editor/libeditor/HTMLEditSubActionHandler.cpp b/editor/libeditor/HTMLEditSubActionHandler.cpp index e70e9e0f4e985..64d91948f2fed 100644 --- a/editor/libeditor/HTMLEditSubActionHandler.cpp +++ b/editor/libeditor/HTMLEditSubActionHandler.cpp @@ -43,7 +43,6 @@ #include "nsIContent.h" #include "nsID.h" #include "nsIFrame.h" -#include "nsIHTMLAbsPosEditor.h" #include "nsINode.h" #include "nsLiteralString.h" #include "nsRange.h" diff --git a/editor/libeditor/HTMLEditor.cpp b/editor/libeditor/HTMLEditor.cpp index 01259b989d34c..8a395d62c5793 100644 --- a/editor/libeditor/HTMLEditor.cpp +++ b/editor/libeditor/HTMLEditor.cpp @@ -29,14 +29,12 @@ #include "nsHTMLDocument.h" #include "mozilla/dom/DocumentInlines.h" #include "nsISelectionController.h" -#include "nsIInlineSpellChecker.h" #include "nsIPrincipal.h" #include "mozilla/css/Loader.h" #include "nsIContent.h" #include "nsContentUtils.h" -#include "nsIDocumentEncoder.h" #include "nsGenericHTMLElement.h" #include "nsPresContext.h" #include "nsFocusManager.h" diff --git a/editor/libeditor/HTMLEditorDataTransfer.cpp b/editor/libeditor/HTMLEditorDataTransfer.cpp index c5a9539158878..b8c7e2499781f 100644 --- a/editor/libeditor/HTMLEditorDataTransfer.cpp +++ b/editor/libeditor/HTMLEditorDataTransfer.cpp @@ -41,9 +41,9 @@ #include "nsIClipboard.h" #include "nsIContent.h" #include "mozilla/dom/Document.h" +#include "nsIDocumentEncoder.h" #include "nsIFile.h" #include "nsIInputStream.h" -#include "nsIMIMEService.h" #include "nsNameSpaceManager.h" #include "nsINode.h" #include "nsIParserUtils.h" @@ -52,7 +52,6 @@ #include "nsISupportsPrimitives.h" #include "nsISupportsUtils.h" #include "nsITransferable.h" -#include "nsIURI.h" #include "nsIVariant.h" #include "nsLinebreakConverter.h" #include "nsLiteralString.h" diff --git a/editor/libeditor/HTMLEditorDocumentCommands.cpp b/editor/libeditor/HTMLEditorDocumentCommands.cpp index def1cfdf9ae5f..1e5b3a44465a7 100644 --- a/editor/libeditor/HTMLEditorDocumentCommands.cpp +++ b/editor/libeditor/HTMLEditorDocumentCommands.cpp @@ -5,18 +5,16 @@ #include "mozilla/EditorCommands.h" -#include "mozilla/HTMLEditor.h" // for HTMLEditor -#include "mozilla/TextEditor.h" // for TextEditor -#include "mozilla/dom/Document.h" // for Document -#include "nsCommandParams.h" // for nsCommandParams -#include "nsIDocShell.h" // for nsIDocShell -#include "nsIEditingSession.h" // for nsIEditingSession, etc -#include "nsIPrincipal.h" // for nsIPrincipal -#include "nsISelectionController.h" // for nsISelectionController -#include "nsISupportsImpl.h" // for nsPresContext::Release -#include "nsISupportsUtils.h" // for NS_IF_ADDREF -#include "nsIURI.h" // for nsIURI -#include "nsPresContext.h" // for nsPresContext +#include "mozilla/HTMLEditor.h" // for HTMLEditor +#include "mozilla/TextEditor.h" // for TextEditor +#include "mozilla/dom/Document.h" // for Document +#include "nsCommandParams.h" // for nsCommandParams +#include "nsIEditingSession.h" // for nsIEditingSession, etc +#include "nsIPrincipal.h" // for nsIPrincipal +#include "nsISupportsImpl.h" // for nsPresContext::Release +#include "nsISupportsUtils.h" // for NS_IF_ADDREF +#include "nsIURI.h" // for nsIURI +#include "nsPresContext.h" // for nsPresContext // defines #define STATE_ENABLED "state_enabled" diff --git a/editor/libeditor/HTMLInlineTableEditor.cpp b/editor/libeditor/HTMLInlineTableEditor.cpp index e11b2529898c6..9ead0a7c1ac92 100644 --- a/editor/libeditor/HTMLInlineTableEditor.cpp +++ b/editor/libeditor/HTMLInlineTableEditor.cpp @@ -13,7 +13,6 @@ #include "nsError.h" #include "nsGenericHTMLElement.h" #include "nsIContent.h" -#include "nsIHTMLObjectResizer.h" #include "nsLiteralString.h" #include "nsReadableUtils.h" #include "nsString.h" diff --git a/editor/libeditor/TextEditSubActionHandler.cpp b/editor/libeditor/TextEditSubActionHandler.cpp index 2f806773ad872..c2f103918e9d1 100644 --- a/editor/libeditor/TextEditSubActionHandler.cpp +++ b/editor/libeditor/TextEditSubActionHandler.cpp @@ -27,7 +27,6 @@ #include "nsError.h" #include "nsGkAtoms.h" #include "nsIContent.h" -#include "nsIDocumentEncoder.h" #include "nsNameSpaceManager.h" #include "nsINode.h" #include "nsIPlaintextEditor.h" diff --git a/editor/libeditor/TextEditorDataTransfer.cpp b/editor/libeditor/TextEditorDataTransfer.cpp index f750420d3a3cf..7dcc1f7c5c07a 100644 --- a/editor/libeditor/TextEditorDataTransfer.cpp +++ b/editor/libeditor/TextEditorDataTransfer.cpp @@ -22,12 +22,10 @@ #include "mozilla/dom/Document.h" #include "nsIDragService.h" #include "nsIDragSession.h" -#include "nsIEditor.h" #include "nsIDocShell.h" #include "nsIDocShellTreeItem.h" #include "nsIPrincipal.h" #include "nsIFormControl.h" -#include "nsIPlaintextEditor.h" #include "nsISupportsPrimitives.h" #include "nsITransferable.h" #include "nsIVariant.h" diff --git a/editor/txmgr/nsTransactionManagerCID.h b/editor/txmgr/nsTransactionManagerCID.h index a29e0c4f845d6..11beb737c7702 100644 --- a/editor/txmgr/nsTransactionManagerCID.h +++ b/editor/txmgr/nsTransactionManagerCID.h @@ -5,4 +5,3 @@ // XXX Needs to modify mailnews/base/src/nsMsgWindow.cpp before removing this // header file. -#include "nsITransactionManager.h" diff --git a/extensions/auth/nsAuthGSSAPI.cpp b/extensions/auth/nsAuthGSSAPI.cpp index 2c32c88b091fd..0119f281eba11 100644 --- a/extensions/auth/nsAuthGSSAPI.cpp +++ b/extensions/auth/nsAuthGSSAPI.cpp @@ -18,8 +18,6 @@ #include "mozilla/IntegerPrintfMacros.h" #include "nsCOMPtr.h" -#include "nsIPrefService.h" -#include "nsIServiceManager.h" #include "nsMemory.h" #include "nsNativeCharsetUtils.h" #include "mozilla/Preferences.h" diff --git a/extensions/auth/nsAuthSASL.cpp b/extensions/auth/nsAuthSASL.cpp index 6932f1c168421..d076d14d53148 100644 --- a/extensions/auth/nsAuthSASL.cpp +++ b/extensions/auth/nsAuthSASL.cpp @@ -5,8 +5,8 @@ #include "nsComponentManagerUtils.h" #include "nsNativeCharsetUtils.h" -#include "nsIServiceManager.h" #include "nsIPrefService.h" +#include "nsServiceManagerUtils.h" #include "nsAuthSASL.h" diff --git a/extensions/auth/nsAuthSSPI.cpp b/extensions/auth/nsAuthSSPI.cpp index 298ce98299864..2d038f59f759e 100644 --- a/extensions/auth/nsAuthSSPI.cpp +++ b/extensions/auth/nsAuthSSPI.cpp @@ -14,8 +14,8 @@ // #include "nsAuthSSPI.h" +#include "nsComponentManagerUtils.h" #include "nsDNSService2.h" -#include "nsIServiceManager.h" #include "nsIDNSService.h" #include "nsIDNSRecord.h" #include "nsMemory.h" diff --git a/extensions/auth/nsHttpNegotiateAuth.cpp b/extensions/auth/nsHttpNegotiateAuth.cpp index 2d1e029b01bdb..99720475b9ddf 100644 --- a/extensions/auth/nsHttpNegotiateAuth.cpp +++ b/extensions/auth/nsHttpNegotiateAuth.cpp @@ -20,10 +20,7 @@ #include "nsHttpNegotiateAuth.h" #include "nsIHttpAuthenticableChannel.h" -#include "nsIProxiedChannel.h" #include "nsIAuthModule.h" -#include "nsIServiceManager.h" -#include "nsIPrefService.h" #include "nsIPrefBranch.h" #include "nsIProxyInfo.h" #include "nsIURI.h" @@ -492,8 +489,7 @@ nsHttpNegotiateAuth::GenerateCredentials( while (*challenge == ' ') challenge++; len = strlen(challenge); - if (!len) - return NS_ERROR_UNEXPECTED; + if (!len) return NS_ERROR_UNEXPECTED; // strip off any padding (see bug 230351) while (len && challenge[len - 1] == '=') len--; diff --git a/extensions/permissions/nsContentBlocker.cpp b/extensions/permissions/nsContentBlocker.cpp index a29a6dc4d1b4d..671537aac2c50 100644 --- a/extensions/permissions/nsContentBlocker.cpp +++ b/extensions/permissions/nsContentBlocker.cpp @@ -5,14 +5,12 @@ #include "nsContentBlocker.h" #include "nsIContent.h" #include "nsIURI.h" -#include "nsIServiceManager.h" #include "nsIDocShellTreeItem.h" #include "nsIPrefService.h" #include "nsIPrefBranch.h" #include "nsIDocShell.h" #include "nsString.h" #include "nsContentPolicyUtils.h" -#include "nsIObjectLoadingContent.h" #include "mozilla/ArrayUtils.h" #include "nsContentUtils.h" #include "nsNetUtil.h" diff --git a/extensions/permissions/nsPermissionManager.cpp b/extensions/permissions/nsPermissionManager.cpp index f59a564e7a7b6..ceccc86bfd892 100644 --- a/extensions/permissions/nsPermissionManager.cpp +++ b/extensions/permissions/nsPermissionManager.cpp @@ -19,17 +19,17 @@ #include "nsNetUtil.h" #include "nsTArray.h" #include "nsReadableUtils.h" -#include "nsILineInputStream.h" #include "nsAppDirectoryServiceDefs.h" #include "nsDirectoryServiceDefs.h" +#include "mozIStorageCompletionCallback.h" +#include "mozIStorageService.h" +#include "mozIStorageStatementCallback.h" #include "mozilla/storage.h" #include "mozilla/Attributes.h" #include "nsXULAppAPI.h" #include "nsIPrincipal.h" #include "nsIURIMutator.h" #include "nsContentUtils.h" -#include "nsIScriptSecurityManager.h" -#include "nsIEffectiveTLDService.h" #include "nsPIDOMWindow.h" #include "mozilla/dom/Document.h" #include "mozilla/net/NeckoMessageUtils.h" diff --git a/extensions/permissions/nsPermissionManager.h b/extensions/permissions/nsPermissionManager.h index 283c1a8cfcb4f..b02d2488e9fe0 100644 --- a/extensions/permissions/nsPermissionManager.h +++ b/extensions/permissions/nsPermissionManager.h @@ -20,7 +20,6 @@ #include "nsHashKeys.h" #include "nsCOMArray.h" #include "nsDataHashtable.h" -#include "nsIRunnable.h" #include "nsRefPtrHashtable.h" #include "mozilla/BasePrincipal.h" #include "mozilla/ExpandedPrincipal.h" diff --git a/extensions/pref/autoconfig/src/nsAutoConfig.cpp b/extensions/pref/autoconfig/src/nsAutoConfig.cpp index 54a767a317956..783dd01d08d17 100644 --- a/extensions/pref/autoconfig/src/nsAutoConfig.cpp +++ b/extensions/pref/autoconfig/src/nsAutoConfig.cpp @@ -9,13 +9,13 @@ #include "nsIURI.h" #include "nsIHttpChannel.h" -#include "nsIFileStreams.h" #include "nsThreadUtils.h" #include "nsAppDirectoryServiceDefs.h" #include "nsIObserverService.h" #include "nsLiteralString.h" #include "nsIPromptService.h" -#include "nsIServiceManager.h" +#include "nsIInputStream.h" +#include "nsIOutputStream.h" #include "nsIStringBundle.h" #include "nsContentUtils.h" #include "nsCRT.h" diff --git a/extensions/pref/autoconfig/src/nsAutoConfig.h b/extensions/pref/autoconfig/src/nsAutoConfig.h index 2670f3ea25001..3a78239286b6b 100644 --- a/extensions/pref/autoconfig/src/nsAutoConfig.h +++ b/extensions/pref/autoconfig/src/nsAutoConfig.h @@ -11,11 +11,11 @@ #include "nsINamed.h" #include "nsIObserver.h" #include "nsIStreamListener.h" -#include "nsIPrefService.h" -#include "nsIPrefBranch.h" #include "nsWeakReference.h" #include "nsString.h" +class nsIPrefBranch; + class nsAutoConfig final : public nsITimerCallback, public nsIStreamListener, public nsIObserver, diff --git a/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp b/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp index ac6a994eb7ee9..adaef0ca01375 100644 --- a/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp +++ b/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp @@ -8,17 +8,12 @@ #include "jsapi.h" #include "nsIXPConnect.h" #include "nsCOMPtr.h" -#include "nsIServiceManager.h" -#include "nsIComponentManager.h" #include "nsString.h" -#include "nsIPrefBranch.h" -#include "nsIPrefService.h" #include "nspr.h" #include "mozilla/Attributes.h" #include "mozilla/Maybe.h" #include "mozilla/NullPrincipal.h" #include "nsContentUtils.h" -#include "nsIScriptSecurityManager.h" #include "nsJSPrincipals.h" #include "nsIScriptError.h" #include "js/Wrapper.h" diff --git a/extensions/pref/autoconfig/src/nsReadConfig.cpp b/extensions/pref/autoconfig/src/nsReadConfig.cpp index 3640b39275829..ff4bbfcbd82e6 100644 --- a/extensions/pref/autoconfig/src/nsReadConfig.cpp +++ b/extensions/pref/autoconfig/src/nsReadConfig.cpp @@ -11,13 +11,11 @@ #include "nsIAppStartup.h" #include "nsContentUtils.h" #include "nsDirectoryServiceDefs.h" -#include "nsIComponentManager.h" #include "nsIFile.h" #include "nsIObserverService.h" #include "nsIPrefBranch.h" #include "nsIPrefService.h" #include "nsIPromptService.h" -#include "nsIServiceManager.h" #include "nsIStringBundle.h" #include "nsNetUtil.h" #include "nsString.h" diff --git a/extensions/spellcheck/hunspell/glue/mozHunspell.cpp b/extensions/spellcheck/hunspell/glue/mozHunspell.cpp index 0b3edfc47c380..079eeba6f4b48 100644 --- a/extensions/spellcheck/hunspell/glue/mozHunspell.cpp +++ b/extensions/spellcheck/hunspell/glue/mozHunspell.cpp @@ -61,14 +61,12 @@ #include "nsReadableUtils.h" #include "nsString.h" #include "nsIObserverService.h" -#include "nsISimpleEnumerator.h" #include "nsIDirectoryEnumerator.h" #include "nsIFile.h" #include "nsUnicharUtils.h" #include "nsCRT.h" #include "mozInlineSpellChecker.h" #include -#include "nsIPrefService.h" #include "nsIPrefBranch.h" #include "nsNetUtil.h" #include "mozilla/dom/ContentParent.h" diff --git a/extensions/spellcheck/src/mozEnglishWordUtils.cpp b/extensions/spellcheck/src/mozEnglishWordUtils.cpp index 0a26c6cbc4a6d..a1b249b6344d8 100644 --- a/extensions/spellcheck/src/mozEnglishWordUtils.cpp +++ b/extensions/spellcheck/src/mozEnglishWordUtils.cpp @@ -4,8 +4,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "mozEnglishWordUtils.h" +#include "nsComponentManagerUtils.h" #include "nsReadableUtils.h" -#include "nsIServiceManager.h" #include "nsUnicharUtils.h" #include "nsUnicodeProperties.h" #include "nsCRT.h" diff --git a/extensions/spellcheck/src/mozInlineSpellChecker.cpp b/extensions/spellcheck/src/mozInlineSpellChecker.cpp index 8b239025d50e5..bf4b5279850a8 100644 --- a/extensions/spellcheck/src/mozInlineSpellChecker.cpp +++ b/extensions/spellcheck/src/mozInlineSpellChecker.cpp @@ -50,12 +50,8 @@ #include "nsCRT.h" #include "nsGenericHTMLElement.h" #include "nsRange.h" -#include "nsIPlaintextEditor.h" #include "nsIPrefBranch.h" -#include "nsIPrefService.h" #include "nsIRunnable.h" -#include "nsISelectionController.h" -#include "nsIServiceManager.h" #include "nsString.h" #include "nsThreadUtils.h" #include "nsUnicharUtils.h" diff --git a/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp b/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp index 7b1e714321204..574fc30e03201 100644 --- a/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp +++ b/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp @@ -13,7 +13,6 @@ #include "nsDebug.h" #include "nsAtom.h" #include "nsComponentManagerUtils.h" -#include "nsIEditor.h" #include "nsUnicodeProperties.h" #include "nsServiceManagerUtils.h" #include "nsIContent.h" diff --git a/extensions/spellcheck/src/mozPersonalDictionary.cpp b/extensions/spellcheck/src/mozPersonalDictionary.cpp index c0b636ef359b5..50aa86775f0bd 100644 --- a/extensions/spellcheck/src/mozPersonalDictionary.cpp +++ b/extensions/spellcheck/src/mozPersonalDictionary.cpp @@ -9,8 +9,6 @@ #include "nsIFile.h" #include "nsAppDirectoryServiceDefs.h" #include "nsIObserverService.h" -#include "nsIPrefService.h" -#include "nsIPrefBranch.h" #include "nsIWeakReference.h" #include "nsCRT.h" #include "nsNetUtil.h" diff --git a/extensions/spellcheck/src/mozSpellChecker.cpp b/extensions/spellcheck/src/mozSpellChecker.cpp index 6aa350c6c0c2b..f3ccb1a90a7cc 100644 --- a/extensions/spellcheck/src/mozSpellChecker.cpp +++ b/extensions/spellcheck/src/mozSpellChecker.cpp @@ -4,7 +4,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "mozSpellChecker.h" -#include "nsIServiceManager.h" #include "nsIStringEnumerator.h" #include "nsICategoryManager.h" #include "nsISupportsPrimitives.h" diff --git a/gfx/gl/GLLibraryEGL.h b/gfx/gl/GLLibraryEGL.h index 6585b3669224f..9525e9adc3f76 100644 --- a/gfx/gl/GLLibraryEGL.h +++ b/gfx/gl/GLLibraryEGL.h @@ -12,7 +12,6 @@ #include "GLLibraryLoader.h" #include "mozilla/StaticMutex.h" #include "mozilla/ThreadLocal.h" -#include "nsIFile.h" #include "GeckoProfiler.h" #include diff --git a/gfx/ipc/GPUProcessHost.cpp b/gfx/ipc/GPUProcessHost.cpp index 8cf4944c8fe8a..033e41a4124f4 100644 --- a/gfx/ipc/GPUProcessHost.cpp +++ b/gfx/ipc/GPUProcessHost.cpp @@ -7,7 +7,6 @@ #include "GPUProcessHost.h" #include "chrome/common/process_watcher.h" #include "mozilla/gfx/Logging.h" -#include "nsITimer.h" #include "mozilla/Preferences.h" #include "mozilla/StaticPrefs_layers.h" #include "VRGPUChild.h" diff --git a/gfx/ipc/GPUProcessManager.h b/gfx/ipc/GPUProcessManager.h index 9752d0f3e366d..f5b8c9c3f64e2 100644 --- a/gfx/ipc/GPUProcessManager.h +++ b/gfx/ipc/GPUProcessManager.h @@ -18,7 +18,6 @@ #include "mozilla/ipc/Transport.h" #include "mozilla/layers/LayersTypes.h" #include "mozilla/webrender/WebRenderTypes.h" -#include "nsIObserverService.h" #include "nsThreadUtils.h" class nsBaseWidget; diff --git a/gfx/layers/LayerScope.cpp b/gfx/layers/LayerScope.cpp index 65a508b5e7ef1..adae0a0afcc73 100644 --- a/gfx/layers/LayerScope.cpp +++ b/gfx/layers/LayerScope.cpp @@ -29,9 +29,6 @@ #include "GLContextProvider.h" #include "GLReadTexImageHelper.h" -#include "nsIServiceManager.h" -#include "nsIConsoleService.h" - #include #include "mozilla/LinkedList.h" #include "mozilla/Base64.h" @@ -44,7 +41,6 @@ #include "nsNetCID.h" #include "nsIOutputStream.h" #include "nsIAsyncInputStream.h" -#include "nsIEventTarget.h" #include "nsProxyRelease.h" #include diff --git a/gfx/layers/PaintThread.cpp b/gfx/layers/PaintThread.cpp index a45f9cd4c94d3..d4810deddfe3b 100644 --- a/gfx/layers/PaintThread.cpp +++ b/gfx/layers/PaintThread.cpp @@ -22,7 +22,6 @@ #ifdef XP_MACOSX # include "nsCocoaFeatures.h" #endif -#include "nsIPropertyBag2.h" #include "nsIThreadManager.h" #include "nsServiceManagerUtils.h" #include "prsystem.h" diff --git a/gfx/layers/client/ClientLayerManager.h b/gfx/layers/client/ClientLayerManager.h index f583f06f6304e..cfe15cb73e84c 100644 --- a/gfx/layers/client/ClientLayerManager.h +++ b/gfx/layers/client/ClientLayerManager.h @@ -23,7 +23,6 @@ #include "mozilla/layers/APZTestData.h" // for APZTestData #include "mozilla/layers/MemoryPressureObserver.h" #include "nsCOMPtr.h" // for already_AddRefed -#include "nsIObserver.h" // for nsIObserver #include "nsISupportsImpl.h" // for Layer::Release, etc #include "nsRect.h" // for mozilla::gfx::IntRect #include "nsTArray.h" // for nsTArray diff --git a/gfx/layers/ipc/CompositorBridgeChild.cpp b/gfx/layers/ipc/CompositorBridgeChild.cpp index d4e6ff4a07992..50e272594e992 100644 --- a/gfx/layers/ipc/CompositorBridgeChild.cpp +++ b/gfx/layers/ipc/CompositorBridgeChild.cpp @@ -36,7 +36,6 @@ #include "gfxConfig.h" #include "nsAutoPtr.h" #include "nsDebug.h" // for NS_WARNING -#include "nsIObserver.h" // for nsIObserver #include "nsISupportsImpl.h" // for MOZ_COUNT_CTOR, etc #include "nsTArray.h" // for nsTArray, nsTArray_Impl #include "nsXULAppAPI.h" // for XRE_GetIOMessageLoop, etc diff --git a/gfx/layers/ipc/ImageBridgeChild.h b/gfx/layers/ipc/ImageBridgeChild.h index 6d8f3cc0939f1..73654c3e8d5e1 100644 --- a/gfx/layers/ipc/ImageBridgeChild.h +++ b/gfx/layers/ipc/ImageBridgeChild.h @@ -21,7 +21,6 @@ #include "mozilla/layers/PImageBridgeChild.h" #include "mozilla/Mutex.h" #include "mozilla/webrender/WebRenderTypes.h" -#include "nsIObserver.h" #include "nsRegion.h" // for nsIntRegion #include "mozilla/gfx/Rect.h" #include "mozilla/ReentrantMonitor.h" // for ReentrantMonitor, etc diff --git a/gfx/src/gfxCrashReporterUtils.cpp b/gfx/src/gfxCrashReporterUtils.cpp index 0856f6588d08f..42ee69a1f8714 100644 --- a/gfx/src/gfxCrashReporterUtils.cpp +++ b/gfx/src/gfxCrashReporterUtils.cpp @@ -17,7 +17,6 @@ #include "nsError.h" // for NS_OK, NS_FAILED, nsresult #include "nsExceptionHandler.h" // for AppendAppNotesToCrashReport #include "nsID.h" -#include "nsIEventTarget.h" // for NS_DISPATCH_NORMAL #include "nsIObserver.h" // for nsIObserver, etc #include "nsIObserverService.h" // for nsIObserverService #include "nsIRunnable.h" // for nsIRunnable diff --git a/gfx/thebes/DeviceManagerDx.cpp b/gfx/thebes/DeviceManagerDx.cpp index 5bc1af11ee41c..2c5ebf93de3c3 100644 --- a/gfx/thebes/DeviceManagerDx.cpp +++ b/gfx/thebes/DeviceManagerDx.cpp @@ -23,7 +23,6 @@ #include "mozilla/layers/MLGDeviceD3D11.h" #include "mozilla/layers/PaintThread.h" #include "nsExceptionHandler.h" -#include "nsIGfxInfo.h" #include "nsPrintfCString.h" #include "nsString.h" diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp index 3f4647e317b3d..702f684d14702 100644 --- a/gfx/thebes/gfxASurface.cpp +++ b/gfx/thebes/gfxASurface.cpp @@ -40,13 +40,11 @@ #include #include -#include "imgIEncoder.h" #include "nsComponentManagerUtils.h" #include "nsISupportsUtils.h" #include "nsCOMPtr.h" #include "nsServiceManagerUtils.h" #include "nsString.h" -#include "nsIClipboardHelper.h" using namespace mozilla; using namespace mozilla::gfx; diff --git a/gfx/thebes/gfxAndroidPlatform.cpp b/gfx/thebes/gfxAndroidPlatform.cpp index e697d050c0f28..99ba531205d38 100644 --- a/gfx/thebes/gfxAndroidPlatform.cpp +++ b/gfx/thebes/gfxAndroidPlatform.cpp @@ -20,7 +20,6 @@ #include "gfxTextRun.h" #include "nsXULAppAPI.h" #include "nsIScreen.h" -#include "nsIScreenManager.h" #include "nsServiceManagerUtils.h" #include "nsUnicodeProperties.h" #include "cairo.h" diff --git a/gfx/thebes/gfxDWriteCommon.h b/gfx/thebes/gfxDWriteCommon.h index 000e3a01eeff8..6d8f3afd40da7 100644 --- a/gfx/thebes/gfxDWriteCommon.h +++ b/gfx/thebes/gfxDWriteCommon.h @@ -10,13 +10,11 @@ #include "mozilla/MemoryReporting.h" #include "mozilla/FontPropertyTypes.h" #include "nscore.h" -#include "nsIServiceManager.h" #include "nsCOMPtr.h" #include "cairo-features.h" #include "gfxFontConstants.h" #include "nsTArray.h" #include "gfxWindowsPlatform.h" -#include "nsIUUIDGenerator.h" #include #include diff --git a/gfx/thebes/gfxDWriteFontList.cpp b/gfx/thebes/gfxDWriteFontList.cpp index f23fd330e96c0..302220a91c542 100644 --- a/gfx/thebes/gfxDWriteFontList.cpp +++ b/gfx/thebes/gfxDWriteFontList.cpp @@ -19,12 +19,9 @@ #include "nsDirectoryServiceUtils.h" #include "nsDirectoryServiceDefs.h" #include "nsAppDirectoryServiceDefs.h" -#include "nsISimpleEnumerator.h" #include "gfxGDIFontList.h" -#include "nsIWindowsRegKey.h" - #include "harfbuzz/hb.h" using namespace mozilla; diff --git a/gfx/thebes/gfxFT2FontList.cpp b/gfx/thebes/gfxFT2FontList.cpp index 032033be77417..151978e7921ce 100644 --- a/gfx/thebes/gfxFT2FontList.cpp +++ b/gfx/thebes/gfxFT2FontList.cpp @@ -13,7 +13,6 @@ #include "mozilla/Omnijar.h" #include "mozilla/UniquePtr.h" #include "mozilla/UniquePtrExtensions.h" -#include "nsIInputStream.h" #include "nsReadableUtils.h" #include "nsXULAppAPI.h" @@ -44,7 +43,6 @@ #include "nsDirectoryServiceUtils.h" #include "nsDirectoryServiceDefs.h" #include "nsAppDirectoryServiceDefs.h" -#include "nsISimpleEnumerator.h" #include "nsIMemory.h" #include "gfxFontConstants.h" diff --git a/gfx/thebes/gfxFontInfoLoader.h b/gfx/thebes/gfxFontInfoLoader.h index 0befb0be30ae0..2e682d6d1a855 100644 --- a/gfx/thebes/gfxFontInfoLoader.h +++ b/gfx/thebes/gfxFontInfoLoader.h @@ -13,7 +13,6 @@ #include "nsRefPtrHashtable.h" #include "nsString.h" #include "gfxFont.h" -#include "nsIRunnable.h" #include "mozilla/Atomics.h" #include "mozilla/TimeStamp.h" #include "nsISupportsImpl.h" diff --git a/gfx/thebes/gfxGDIFontList.cpp b/gfx/thebes/gfxGDIFontList.cpp index c70727ea3b826..a25122cee5b81 100644 --- a/gfx/thebes/gfxGDIFontList.cpp +++ b/gfx/thebes/gfxGDIFontList.cpp @@ -23,8 +23,6 @@ #include "nsDirectoryServiceUtils.h" #include "nsDirectoryServiceDefs.h" #include "nsAppDirectoryServiceDefs.h" -#include "nsISimpleEnumerator.h" -#include "nsIWindowsRegKey.h" #include "gfxFontConstants.h" #include "GeckoProfiler.h" diff --git a/gfx/thebes/gfxUserFontSet.cpp b/gfx/thebes/gfxUserFontSet.cpp index fd15654f7b96e..d35765bc2920d 100644 --- a/gfx/thebes/gfxUserFontSet.cpp +++ b/gfx/thebes/gfxUserFontSet.cpp @@ -7,7 +7,6 @@ #include "gfxUserFontSet.h" #include "gfxPlatform.h" -#include "nsIProtocolHandler.h" #include "gfxFontConstants.h" #include "mozilla/FontPropertyTypes.h" #include "mozilla/Preferences.h" diff --git a/gfx/thebes/gfxUserFontSet.h b/gfx/thebes/gfxUserFontSet.h index 7e0cdbbe09ed5..c4cd31288b195 100644 --- a/gfx/thebes/gfxUserFontSet.h +++ b/gfx/thebes/gfxUserFontSet.h @@ -15,10 +15,8 @@ #include "nsCOMPtr.h" #include "nsIFontLoadCompleteCallback.h" #include "nsIMemoryReporter.h" -#include "nsIPrincipal.h" #include "nsIRunnable.h" #include "nsIScriptError.h" -#include "nsIURI.h" #include "nsIReferrerInfo.h" #include "nsURIHashKey.h" #include "mozilla/FontPropertyTypes.h" diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp index 37dfb754155b5..f64ecc774b189 100644 --- a/gfx/thebes/gfxWindowsPlatform.cpp +++ b/gfx/thebes/gfxWindowsPlatform.cpp @@ -29,8 +29,6 @@ #include "mozilla/Telemetry.h" #include "GeckoProfiler.h" -#include "nsIWindowsRegKey.h" -#include "nsIFile.h" #include "plbase64.h" #include "nsIXULRuntime.h" #include "imgLoader.h" diff --git a/gfx/vr/VRDisplayClient.cpp b/gfx/vr/VRDisplayClient.cpp index b914b8d5c142f..53abb69e1f7b2 100644 --- a/gfx/vr/VRDisplayClient.cpp +++ b/gfx/vr/VRDisplayClient.cpp @@ -17,7 +17,6 @@ #include "mozilla/Preferences.h" #include "mozilla/Unused.h" #include "nsServiceManagerUtils.h" -#include "nsIScreenManager.h" #ifdef XP_WIN # include "../layers/d3d11/CompositorD3D11.h" diff --git a/gfx/vr/VRDisplayClient.h b/gfx/vr/VRDisplayClient.h index 13e8da2b4c4b2..306510079aa23 100644 --- a/gfx/vr/VRDisplayClient.h +++ b/gfx/vr/VRDisplayClient.h @@ -7,7 +7,6 @@ #ifndef GFX_VR_DISPLAY_CLIENT_H #define GFX_VR_DISPLAY_CLIENT_H -#include "nsIScreen.h" #include "nsCOMPtr.h" #include "mozilla/Attributes.h" #include "mozilla/RefPtr.h" diff --git a/hal/Hal.cpp b/hal/Hal.cpp index 0891763549eea..5f99271db9dfe 100644 --- a/hal/Hal.cpp +++ b/hal/Hal.cpp @@ -11,9 +11,6 @@ #include "HalSandbox.h" #include "HalWakeLockInternal.h" #include "mozilla/dom/Document.h" -#include "nsIDocShell.h" -#include "nsIBrowserChild.h" -#include "nsIWebNavigation.h" #include "nsThreadUtils.h" #include "nsXULAppAPI.h" #include "nsPIDOMWindow.h" diff --git a/image/DecodePool.cpp b/image/DecodePool.cpp index cdd6149dd2808..3e880fc1652e8 100644 --- a/image/DecodePool.cpp +++ b/image/DecodePool.cpp @@ -14,12 +14,10 @@ #include "mozilla/TimeStamp.h" #include "nsCOMPtr.h" #include "nsIObserverService.h" -#include "nsIThreadPool.h" #include "nsThreadManager.h" #include "nsThreadUtils.h" #include "nsXPCOMCIDInternal.h" #include "prsystem.h" -#include "nsIXULRuntime.h" #include "Decoder.h" #include "IDecodingTask.h" diff --git a/image/ImageCacheKey.cpp b/image/ImageCacheKey.cpp index 3efe072539a7d..2e425d7b2296a 100644 --- a/image/ImageCacheKey.cpp +++ b/image/ImageCacheKey.cpp @@ -9,7 +9,6 @@ #include "mozilla/Move.h" #include "mozilla/Unused.h" #include "nsContentUtils.h" -#include "nsICookieService.h" #include "nsLayoutUtils.h" #include "nsString.h" #include "mozilla/AntiTrackingCommon.h" diff --git a/image/ImageFactory.cpp b/image/ImageFactory.cpp index c35cd34c90235..e26e472c949af 100644 --- a/image/ImageFactory.cpp +++ b/image/ImageFactory.cpp @@ -10,7 +10,6 @@ #include "mozilla/Likely.h" -#include "nsIHttpChannel.h" #include "nsIFileChannel.h" #include "nsIFile.h" #include "nsMimeTypes.h" @@ -22,7 +21,6 @@ #include "Image.h" #include "nsMediaFragmentURIParser.h" #include "nsContentUtils.h" -#include "nsIScriptSecurityManager.h" #include "mozilla/StaticPrefs_image.h" diff --git a/image/ProgressTracker.cpp b/image/ProgressTracker.cpp index 236a8b0849ce0..86d66ff88636e 100644 --- a/image/ProgressTracker.cpp +++ b/image/ProgressTracker.cpp @@ -7,7 +7,6 @@ #include "ImageLogging.h" #include "ProgressTracker.h" -#include "imgIContainer.h" #include "imgINotificationObserver.h" #include "imgIRequest.h" #include "Image.h" diff --git a/image/RasterImage.h b/image/RasterImage.h index 1c4995af5fdce..c507aa77e4a28 100644 --- a/image/RasterImage.h +++ b/image/RasterImage.h @@ -29,7 +29,6 @@ #include "ImageMetadata.h" #include "ISurfaceProvider.h" #include "Orientation.h" -#include "nsIObserver.h" #include "mozilla/Attributes.h" #include "mozilla/Maybe.h" #include "mozilla/MemoryReporting.h" diff --git a/image/decoders/icon/android/nsIconChannel.cpp b/image/decoders/icon/android/nsIconChannel.cpp index 0b9c6ccaaf018..a0f09b63ded73 100644 --- a/image/decoders/icon/android/nsIconChannel.cpp +++ b/image/decoders/icon/android/nsIconChannel.cpp @@ -8,10 +8,10 @@ #include "mozilla/dom/ContentChild.h" #include "mozilla/NullPrincipal.h" #include "nsMimeTypes.h" -#include "nsIURL.h" #include "nsXULAppAPI.h" #include "AndroidBridge.h" #include "nsIconChannel.h" +#include "nsIIconURI.h" #include "nsIStringStream.h" #include "nsNetUtil.h" #include "nsComponentManagerUtils.h" diff --git a/image/decoders/icon/android/nsIconChannel.h b/image/decoders/icon/android/nsIconChannel.h index 8f6acd89c60aa..e25196c6ee76d 100644 --- a/image/decoders/icon/android/nsIconChannel.h +++ b/image/decoders/icon/android/nsIconChannel.h @@ -10,7 +10,6 @@ #include "nsIChannel.h" #include "nsIURI.h" -#include "nsIIconURI.h" #include "nsCOMPtr.h" /** diff --git a/image/decoders/icon/gtk/nsIconChannel.h b/image/decoders/icon/gtk/nsIconChannel.h index 6f8ae7a2c2f54..5a8bae263ab4a 100644 --- a/image/decoders/icon/gtk/nsIconChannel.h +++ b/image/decoders/icon/gtk/nsIconChannel.h @@ -8,7 +8,6 @@ #include "mozilla/Attributes.h" #include "nsIChannel.h" -#include "nsIStreamListener.h" #include "nsIURI.h" #include "nsIIconURI.h" #include "nsCOMPtr.h" diff --git a/image/decoders/icon/mac/nsIconChannelCocoa.mm b/image/decoders/icon/mac/nsIconChannelCocoa.mm index 0f1fdfe59730b..0813f423eae07 100644 --- a/image/decoders/icon/mac/nsIconChannelCocoa.mm +++ b/image/decoders/icon/mac/nsIconChannelCocoa.mm @@ -9,18 +9,15 @@ #include "mozilla/BasePrincipal.h" #include "mozilla/EndianUtils.h" #include "nsIIconURI.h" -#include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" #include "nsIInterfaceRequestorUtils.h" #include "nsString.h" #include "nsMimeTypes.h" #include "nsMemory.h" -#include "nsIStringStream.h" #include "nsIURL.h" #include "nsNetCID.h" #include "nsIPipe.h" #include "nsIOutputStream.h" -#include "nsIMIMEService.h" #include "nsCExternalHandlerService.h" #include "nsILocalFileMac.h" #include "nsIFileURL.h" diff --git a/image/decoders/icon/nsIconProtocolHandler.cpp b/image/decoders/icon/nsIconProtocolHandler.cpp index 1e966f76cbbdf..035dcd6238e16 100644 --- a/image/decoders/icon/nsIconProtocolHandler.cpp +++ b/image/decoders/icon/nsIconProtocolHandler.cpp @@ -8,11 +8,8 @@ #include "nsIconChannel.h" #include "nsIconURI.h" -#include "nsIURL.h" #include "nsCRT.h" #include "nsCOMPtr.h" -#include "nsIComponentManager.h" -#include "nsIServiceManager.h" #include "nsNetCID.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/image/decoders/icon/win/nsIconChannel.cpp b/image/decoders/icon/win/nsIconChannel.cpp index 80c6be92bc140..90e9943d9167a 100644 --- a/image/decoders/icon/win/nsIconChannel.cpp +++ b/image/decoders/icon/win/nsIconChannel.cpp @@ -10,14 +10,12 @@ #include "nsIconChannel.h" #include "nsIIconURI.h" -#include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" #include "nsIInterfaceRequestorUtils.h" #include "nsString.h" #include "nsReadableUtils.h" #include "nsMimeTypes.h" #include "nsMemory.h" -#include "nsIStringStream.h" #include "nsIURL.h" #include "nsIPipe.h" #include "nsNetCID.h" diff --git a/image/decoders/nsBMPDecoder.cpp b/image/decoders/nsBMPDecoder.cpp index 2589e5e85e02d..fb0cc6c6fb4dc 100644 --- a/image/decoders/nsBMPDecoder.cpp +++ b/image/decoders/nsBMPDecoder.cpp @@ -101,7 +101,6 @@ #include "mozilla/EndianUtils.h" #include "mozilla/Likely.h" -#include "nsIInputStream.h" #include "RasterImage.h" #include diff --git a/image/decoders/nsGIFDecoder2.cpp b/image/decoders/nsGIFDecoder2.cpp index 2c42f5f60b6cc..4e90cab178274 100644 --- a/image/decoders/nsGIFDecoder2.cpp +++ b/image/decoders/nsGIFDecoder2.cpp @@ -44,7 +44,6 @@ mailing address. #include "imgFrame.h" #include "mozilla/EndianUtils.h" -#include "nsIInputStream.h" #include "RasterImage.h" #include "SurfacePipeFactory.h" diff --git a/image/decoders/nsPNGDecoder.cpp b/image/decoders/nsPNGDecoder.cpp index a2285702a077b..66a8633bf27cb 100644 --- a/image/decoders/nsPNGDecoder.cpp +++ b/image/decoders/nsPNGDecoder.cpp @@ -14,7 +14,6 @@ #include "gfxPlatform.h" #include "imgFrame.h" #include "nsColor.h" -#include "nsIInputStream.h" #include "nsMemory.h" #include "nsRect.h" #include "nspr.h" diff --git a/image/imgFrame.h b/image/imgFrame.h index cb80b63964261..4b4a5cddec630 100644 --- a/image/imgFrame.h +++ b/image/imgFrame.h @@ -13,7 +13,6 @@ #include "mozilla/Move.h" #include "AnimationParams.h" #include "gfxDrawable.h" -#include "imgIContainer.h" #include "MainThreadUtils.h" namespace mozilla { diff --git a/image/imgLoader.cpp b/image/imgLoader.cpp index 53d38d340ef11..265780d140717 100644 --- a/image/imgLoader.cpp +++ b/image/imgLoader.cpp @@ -66,7 +66,6 @@ // so we can associate the document URI with the load group. // until this point, we have an evil hack: #include "nsIHttpChannelInternal.h" -#include "nsILoadContext.h" #include "nsILoadGroupChild.h" #include "nsIDocShell.h" diff --git a/image/test/fuzzing/TestDecoders.cpp b/image/test/fuzzing/TestDecoders.cpp index e0050ffe4cdd0..ba905d786bf26 100644 --- a/image/test/fuzzing/TestDecoders.cpp +++ b/image/test/fuzzing/TestDecoders.cpp @@ -14,7 +14,6 @@ #include "nsCOMPtr.h" #include "nsIInputStream.h" #include "nsIRunnable.h" -#include "nsIStringStream.h" #include "nsIThread.h" #include "mozilla/RefPtr.h" #include "nsString.h" diff --git a/image/test/gtest/Common.cpp b/image/test/gtest/Common.cpp index ea12ee2e9dfa9..5207f79032fe9 100644 --- a/image/test/gtest/Common.cpp +++ b/image/test/gtest/Common.cpp @@ -9,8 +9,8 @@ #include "gfxPlatform.h" +#include "imgITools.h" #include "nsDirectoryServiceDefs.h" -#include "nsIDirectoryService.h" #include "nsIFile.h" #include "nsIInputStream.h" #include "nsIProperties.h" diff --git a/image/test/gtest/Common.h b/image/test/gtest/Common.h index 602cb2bb8e3dd..d9ae96f61171f 100644 --- a/image/test/gtest/Common.h +++ b/image/test/gtest/Common.h @@ -16,7 +16,6 @@ #include "mozilla/gfx/2D.h" #include "Decoder.h" #include "gfxColor.h" -#include "imgITools.h" #include "nsCOMPtr.h" #include "SurfaceFlags.h" #include "SurfacePipe.h" diff --git a/image/test/gtest/TestContainers.cpp b/image/test/gtest/TestContainers.cpp index 0621dcbd43c4c..98326e8764fce 100644 --- a/image/test/gtest/TestContainers.cpp +++ b/image/test/gtest/TestContainers.cpp @@ -7,7 +7,6 @@ #include "BasicLayers.h" #include "Common.h" #include "imgIContainer.h" -#include "imgITools.h" #include "ImageFactory.h" #include "ImageContainer.h" #include "mozilla/gfx/2D.h" diff --git a/image/test/gtest/TestDecodeToSurface.cpp b/image/test/gtest/TestDecodeToSurface.cpp index bf52557b06a1c..099fd45683d4b 100644 --- a/image/test/gtest/TestDecodeToSurface.cpp +++ b/image/test/gtest/TestDecodeToSurface.cpp @@ -6,7 +6,6 @@ #include "Common.h" #include "imgIContainer.h" -#include "imgITools.h" #include "ImageOps.h" #include "mozilla/gfx/2D.h" #include "nsComponentManagerUtils.h" diff --git a/image/test/gtest/TestDecoders.cpp b/image/test/gtest/TestDecoders.cpp index 6cf50a14ed89f..ecceeb1715994 100644 --- a/image/test/gtest/TestDecoders.cpp +++ b/image/test/gtest/TestDecoders.cpp @@ -12,14 +12,11 @@ #include "IDecodingTask.h" #include "ImageOps.h" #include "imgIContainer.h" -#include "imgITools.h" #include "ImageFactory.h" #include "mozilla/gfx/2D.h" #include "nsComponentManagerUtils.h" #include "nsCOMPtr.h" #include "nsIInputStream.h" -#include "nsIRunnable.h" -#include "nsIThread.h" #include "mozilla/RefPtr.h" #include "nsStreamUtils.h" #include "nsString.h" diff --git a/image/test/gtest/TestMetadata.cpp b/image/test/gtest/TestMetadata.cpp index 488ffa9bb0954..b4de5ba2bb31b 100644 --- a/image/test/gtest/TestMetadata.cpp +++ b/image/test/gtest/TestMetadata.cpp @@ -10,14 +10,11 @@ #include "decoders/nsBMPDecoder.h" #include "IDecodingTask.h" #include "imgIContainer.h" -#include "imgITools.h" #include "ImageFactory.h" #include "mozilla/gfx/2D.h" #include "nsComponentManagerUtils.h" #include "nsCOMPtr.h" #include "nsIInputStream.h" -#include "nsIRunnable.h" -#include "nsIThread.h" #include "mozilla/RefPtr.h" #include "nsStreamUtils.h" #include "nsString.h" diff --git a/image/test/gtest/TestSurfaceCache.cpp b/image/test/gtest/TestSurfaceCache.cpp index 36fc82b7a8fd2..6838d6f695fb0 100644 --- a/image/test/gtest/TestSurfaceCache.cpp +++ b/image/test/gtest/TestSurfaceCache.cpp @@ -7,7 +7,6 @@ #include "Common.h" #include "imgIContainer.h" -#include "imgITools.h" #include "ImageFactory.h" #include "mozilla/gfx/2D.h" #include "mozilla/RefPtr.h" diff --git a/intl/chardet/tools/GenCyrillicClass.cpp b/intl/chardet/tools/GenCyrillicClass.cpp index f66ae6fd2b38a..2961483c7a4df 100644 --- a/intl/chardet/tools/GenCyrillicClass.cpp +++ b/intl/chardet/tools/GenCyrillicClass.cpp @@ -5,8 +5,6 @@ #include "nsICharsetConverterManager.h" #include #include "nsISupports.h" -#include "nsIComponentManager.h" -#include "nsIServiceManager.h" #include "nsIUnicodeDecoder.h" #include "nsIUnicodeEncoder.h" #include "nsCRT.h" diff --git a/intl/hyphenation/glue/nsHyphenationManager.cpp b/intl/hyphenation/glue/nsHyphenationManager.cpp index 4c9382bccc2ba..c856a05e96c4a 100644 --- a/intl/hyphenation/glue/nsHyphenationManager.cpp +++ b/intl/hyphenation/glue/nsHyphenationManager.cpp @@ -10,7 +10,6 @@ #include "nsIURI.h" #include "nsIJARURI.h" #include "nsIProperties.h" -#include "nsISimpleEnumerator.h" #include "nsIDirectoryEnumerator.h" #include "nsDirectoryServiceDefs.h" #include "nsNetUtil.h" diff --git a/intl/locale/DateTimeFormat.cpp b/intl/locale/DateTimeFormat.cpp index 03c129105c0e1..968021de0c122 100644 --- a/intl/locale/DateTimeFormat.cpp +++ b/intl/locale/DateTimeFormat.cpp @@ -6,7 +6,6 @@ #include "DateTimeFormat.h" #include "nsCOMPtr.h" -#include "nsIServiceManager.h" #include "mozilla/intl/LocaleService.h" #include "OSPreferences.h" #include "mozIOSPreferences.h" diff --git a/intl/locale/LocaleService.cpp b/intl/locale/LocaleService.cpp index 883a903926ad3..1da509128d768 100644 --- a/intl/locale/LocaleService.cpp +++ b/intl/locale/LocaleService.cpp @@ -16,7 +16,6 @@ #include "nsDirectoryService.h" #include "nsDirectoryServiceDefs.h" #include "nsIObserverService.h" -#include "nsIToolkitChromeRegistry.h" #include "nsStringEnumerator.h" #include "nsXULAppAPI.h" #include "nsZipArchive.h" diff --git a/intl/locale/nsCollation.cpp b/intl/locale/nsCollation.cpp index 32743ea39e588..82f2950b3e7ce 100644 --- a/intl/locale/nsCollation.cpp +++ b/intl/locale/nsCollation.cpp @@ -5,7 +5,6 @@ #include "nsCollation.h" #include "mozilla/intl/LocaleService.h" -#include "nsIServiceManager.h" #include "nsString.h" NS_IMPL_ISUPPORTS(nsCollation, nsICollation) diff --git a/intl/locale/nsLocaleConstructors.h b/intl/locale/nsLocaleConstructors.h index f9908a6923ac9..d0f3992e2eb4e 100644 --- a/intl/locale/nsLocaleConstructors.h +++ b/intl/locale/nsLocaleConstructors.h @@ -9,7 +9,6 @@ #include "nsCollation.h" #include "nsCollationCID.h" #include "mozilla/ModuleUtils.h" -#include "nsIServiceManager.h" #include "LocaleService.h" #include "OSPreferences.h" diff --git a/intl/locale/tests/gtest/TestLocaleService.cpp b/intl/locale/tests/gtest/TestLocaleService.cpp index 7ace8623b43ef..b13ecfd237dfa 100644 --- a/intl/locale/tests/gtest/TestLocaleService.cpp +++ b/intl/locale/tests/gtest/TestLocaleService.cpp @@ -7,7 +7,6 @@ #include "mozilla/Preferences.h" #include "mozilla/intl/LocaleService.h" #include "mozilla/intl/MozLocale.h" -#include "nsIToolkitChromeRegistry.h" using namespace mozilla::intl; diff --git a/intl/locale/tests/gtest/TestLocaleServiceNegotiate.cpp b/intl/locale/tests/gtest/TestLocaleServiceNegotiate.cpp index ffbafb7e1f69a..67e1a462bd10b 100644 --- a/intl/locale/tests/gtest/TestLocaleServiceNegotiate.cpp +++ b/intl/locale/tests/gtest/TestLocaleServiceNegotiate.cpp @@ -5,7 +5,6 @@ #include "gtest/gtest.h" #include "mozilla/intl/LocaleService.h" -#include "nsIToolkitChromeRegistry.h" using namespace mozilla::intl; diff --git a/intl/lwbrk/gtest/TestLineBreak.cpp b/intl/lwbrk/gtest/TestLineBreak.cpp index f8b00c72dcaac..f1faa77b1dc2a 100644 --- a/intl/lwbrk/gtest/TestLineBreak.cpp +++ b/intl/lwbrk/gtest/TestLineBreak.cpp @@ -6,7 +6,6 @@ #include #include "nsXPCOM.h" -#include "nsIComponentManager.h" #include "nsISupports.h" #include "nsServiceManagerUtils.h" #include "nsString.h" diff --git a/intl/strres/nsStringBundle.cpp b/intl/strres/nsStringBundle.cpp index 993bc03bb86ec..3f753b8c12bd0 100644 --- a/intl/strres/nsStringBundle.cpp +++ b/intl/strres/nsStringBundle.cpp @@ -8,8 +8,6 @@ #include "nsString.h" #include "nsIStringBundle.h" #include "nsStringBundleService.h" -#include "nsISupportsPrimitives.h" -#include "nsIMutableArray.h" #include "nsArrayEnumerator.h" #include "nscore.h" #include "nsMemory.h" @@ -22,7 +20,6 @@ #include "nsCOMArray.h" #include "nsTextFormatter.h" #include "nsErrorService.h" -#include "nsICategoryManager.h" #include "nsContentUtils.h" #include "nsPersistentProperties.h" #include "nsQueryObject.h" diff --git a/intl/strres/nsStringBundleService.h b/intl/strres/nsStringBundleService.h index 5a63b1f1922d2..7c13ee6215dca 100644 --- a/intl/strres/nsStringBundleService.h +++ b/intl/strres/nsStringBundleService.h @@ -9,7 +9,6 @@ #include "nsCOMPtr.h" #include "nsDataHashtable.h" #include "nsHashKeys.h" -#include "nsIPersistentProperties2.h" #include "nsIStringBundle.h" #include "nsIObserver.h" #include "nsWeakReference.h" diff --git a/intl/uconv/nsTextToSubURI.cpp b/intl/uconv/nsTextToSubURI.cpp index 7b4c980869075..c4e9faa5dc963 100644 --- a/intl/uconv/nsTextToSubURI.cpp +++ b/intl/uconv/nsTextToSubURI.cpp @@ -12,7 +12,6 @@ #include "mozilla/Preferences.h" #include "mozilla/TextUtils.h" #include "mozilla/Utf8.h" -#include "nsISupportsPrimitives.h" using namespace mozilla; diff --git a/ipc/glue/BackgroundImpl.cpp b/ipc/glue/BackgroundImpl.cpp index 3cb229e3efe4b..f5197a921a977 100644 --- a/ipc/glue/BackgroundImpl.cpp +++ b/ipc/glue/BackgroundImpl.cpp @@ -31,7 +31,6 @@ #include "nsAutoPtr.h" #include "nsCOMPtr.h" #include "nsIEventTarget.h" -#include "nsIMutable.h" #include "nsIObserver.h" #include "nsIObserverService.h" #include "nsIRunnable.h" diff --git a/ipc/glue/BackgroundParentImpl.cpp b/ipc/glue/BackgroundParentImpl.cpp index 04bf13a4c154a..813817d72d0a8 100644 --- a/ipc/glue/BackgroundParentImpl.cpp +++ b/ipc/glue/BackgroundParentImpl.cpp @@ -63,7 +63,6 @@ #include "mozilla/Preferences.h" #include "mozilla/StaticPrefs_dom.h" #include "nsNetUtil.h" -#include "nsIScriptSecurityManager.h" #include "nsProxyRelease.h" #include "mozilla/RefPtr.h" #include "nsThreadUtils.h" diff --git a/ipc/glue/CrashReporterHost.cpp b/ipc/glue/CrashReporterHost.cpp index 90bdaf8f73a67..290add67b2d93 100644 --- a/ipc/glue/CrashReporterHost.cpp +++ b/ipc/glue/CrashReporterHost.cpp @@ -11,7 +11,6 @@ #include "mozilla/Sprintf.h" #include "mozilla/SyncRunnable.h" #include "mozilla/Telemetry.h" -#include "nsIAsyncShutdown.h" #include "nsICrashService.h" #include "nsXULAppAPI.h" diff --git a/ipc/glue/InputStreamUtils.cpp b/ipc/glue/InputStreamUtils.cpp index af38f4ff74039..059699a2b7e20 100644 --- a/ipc/glue/InputStreamUtils.cpp +++ b/ipc/glue/InputStreamUtils.cpp @@ -24,8 +24,9 @@ #include "nsIAsyncInputStream.h" #include "nsIAsyncOutputStream.h" #include "nsID.h" +#include "nsIMIMEInputStream.h" +#include "nsIMultiplexInputStream.h" #include "nsIPipe.h" -#include "nsIXULRuntime.h" #include "nsMIMEInputStream.h" #include "nsMultiplexInputStream.h" #include "nsNetCID.h" diff --git a/ipc/glue/MessageChannel.cpp b/ipc/glue/MessageChannel.cpp index 8ee4475e0d1a3..f00e56cb8035a 100644 --- a/ipc/glue/MessageChannel.cpp +++ b/ipc/glue/MessageChannel.cpp @@ -26,6 +26,7 @@ #include "nsContentUtils.h" #include "nsDataHashtable.h" #include "nsDebug.h" +#include "nsIMemoryReporter.h" #include "nsISupportsImpl.h" #include "nsPrintfCString.h" #include diff --git a/ipc/glue/MessageChannel.h b/ipc/glue/MessageChannel.h index 60ac2dce54b55..1de810ded1d30 100644 --- a/ipc/glue/MessageChannel.h +++ b/ipc/glue/MessageChannel.h @@ -11,7 +11,6 @@ #include "base/basictypes.h" #include "base/message_loop.h" -#include "nsIMemoryReporter.h" #include "mozilla/Atomics.h" #include "mozilla/DebugOnly.h" #include "mozilla/Monitor.h" diff --git a/ipc/glue/MessagePump.cpp b/ipc/glue/MessagePump.cpp index f1de073cfc338..b3bf307a81833 100644 --- a/ipc/glue/MessagePump.cpp +++ b/ipc/glue/MessagePump.cpp @@ -6,7 +6,6 @@ #include "MessagePump.h" -#include "nsIRunnable.h" #include "nsIThread.h" #include "nsITimer.h" #include "nsICancelableRunnable.h" diff --git a/ipc/glue/ProtocolUtils.h b/ipc/glue/ProtocolUtils.h index 0ee4ce09101cc..22c3696267af5 100644 --- a/ipc/glue/ProtocolUtils.h +++ b/ipc/glue/ProtocolUtils.h @@ -33,7 +33,6 @@ #include "mozilla/Scoped.h" #include "mozilla/UniquePtr.h" #include "MainThreadUtils.h" -#include "nsICrashReporter.h" #if defined(ANDROID) && defined(DEBUG) # include diff --git a/ipc/glue/WindowsMessageLoop.cpp b/ipc/glue/WindowsMessageLoop.cpp index e027b689a98f0..46653a9c5d4e6 100644 --- a/ipc/glue/WindowsMessageLoop.cpp +++ b/ipc/glue/WindowsMessageLoop.cpp @@ -13,7 +13,6 @@ #include "nsAutoPtr.h" #include "nsServiceManagerUtils.h" #include "nsString.h" -#include "nsIXULAppInfo.h" #include "WinUtils.h" #include "mozilla/ArrayUtils.h" diff --git a/ipc/ipdl/test/cxx/IPDLUnitTests.h b/ipc/ipdl/test/cxx/IPDLUnitTests.h index c368c5ee840cb..28fc4ee3720d6 100644 --- a/ipc/ipdl/test/cxx/IPDLUnitTests.h +++ b/ipc/ipdl/test/cxx/IPDLUnitTests.h @@ -10,8 +10,6 @@ #include "base/process.h" #include "chrome/common/ipc_channel.h" -#include "nsIAppShell.h" - #include "nsCOMPtr.h" #include "nsDebug.h" #include "nsServiceManagerUtils.h" // do_GetService() diff --git a/ipc/mscom/InterceptorLog.cpp b/ipc/mscom/InterceptorLog.cpp index facaed73e87c2..d93b83103cb74 100644 --- a/ipc/mscom/InterceptorLog.cpp +++ b/ipc/mscom/InterceptorLog.cpp @@ -20,9 +20,9 @@ #include "nsAppDirectoryServiceDefs.h" #include "nsDirectoryServiceDefs.h" #include "nsDirectoryServiceUtils.h" -#include "nsIFileStreams.h" #include "nsIObserver.h" #include "nsIObserverService.h" +#include "nsIOutputStream.h" #include "nsNetUtil.h" #include "nsPrintfCString.h" #include "nsTArray.h" diff --git a/ipc/testshell/XPCShellEnvironment.cpp b/ipc/testshell/XPCShellEnvironment.cpp index caa017694f140..82c44453f47be 100644 --- a/ipc/testshell/XPCShellEnvironment.cpp +++ b/ipc/testshell/XPCShellEnvironment.cpp @@ -28,14 +28,9 @@ #include "mozilla/Utf8.h" // mozilla::Utf8Unit #include "mozilla/XPCOM.h" -#include "nsIChannel.h" -#include "nsIClassInfo.h" -#include "nsIDirectoryService.h" #include "nsIPrincipal.h" #include "nsIScriptSecurityManager.h" -#include "nsIURI.h" #include "nsIXPConnect.h" -#include "nsIXPCScriptable.h" #include "nsJSUtils.h" #include "nsJSPrincipals.h" diff --git a/js/ductwork/debugger/JSDebugger.cpp b/js/ductwork/debugger/JSDebugger.cpp index 4fcb1a6818978..cebfafefedd33 100644 --- a/js/ductwork/debugger/JSDebugger.cpp +++ b/js/ductwork/debugger/JSDebugger.cpp @@ -5,7 +5,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "JSDebugger.h" -#include "nsIXPConnect.h" #include "nsThreadUtils.h" #include "jsapi.h" #include "jsfriendapi.h" diff --git a/js/ipc/JavaScriptParent.cpp b/js/ipc/JavaScriptParent.cpp index 7a8733dc4d52b..2c7deb6d37e13 100644 --- a/js/ipc/JavaScriptParent.cpp +++ b/js/ipc/JavaScriptParent.cpp @@ -9,6 +9,7 @@ #include "mozilla/dom/ContentParent.h" #include "mozilla/dom/ScriptSettings.h" #include "nsJSUtils.h" +#include "nsIConsoleService.h" #include "nsIScriptError.h" #include "jsfriendapi.h" #include "js/Proxy.h" diff --git a/js/xpconnect/loader/AutoMemMap.h b/js/xpconnect/loader/AutoMemMap.h index 809c89018643c..54180d09e3ebb 100644 --- a/js/xpconnect/loader/AutoMemMap.h +++ b/js/xpconnect/loader/AutoMemMap.h @@ -10,7 +10,6 @@ #include "mozilla/MemoryReporting.h" #include "mozilla/RangedPtr.h" #include "mozilla/Result.h" -#include "nsIMemoryReporter.h" #include diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp index affaf136a4705..63c2f4b395962 100644 --- a/js/xpconnect/loader/mozJSComponentLoader.cpp +++ b/js/xpconnect/loader/mozJSComponentLoader.cpp @@ -31,8 +31,6 @@ #include "nsIFile.h" #include "mozJSComponentLoader.h" #include "mozJSLoaderUtils.h" -#include "nsIXPConnect.h" -#include "nsIScriptSecurityManager.h" #include "nsIFileURL.h" #include "nsIJARURI.h" #include "nsNetUtil.h" diff --git a/js/xpconnect/src/XPCJSContext.cpp b/js/xpconnect/src/XPCJSContext.cpp index deeb684df17fb..8dffff025e9ed 100644 --- a/js/xpconnect/src/XPCJSContext.cpp +++ b/js/xpconnect/src/XPCJSContext.cpp @@ -19,13 +19,8 @@ #include "nsNetUtil.h" #include "nsThreadUtils.h" -#include "nsIMemoryInfoDumper.h" -#include "nsIMemoryReporter.h" #include "nsIObserverService.h" -#include "nsIBrowserChild.h" #include "nsIDebug2.h" -#include "nsIDocShell.h" -#include "nsIRunnable.h" #include "nsPIDOMWindow.h" #include "nsPrintfCString.h" #include "mozilla/Preferences.h" @@ -63,7 +58,6 @@ #include "nsAboutProtocolUtils.h" #include "GeckoProfiler.h" -#include "nsIInputStream.h" #include "nsIXULRuntime.h" #include "nsJSPrincipals.h" #include "ExpandedPrincipal.h" diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp index 4cbd44bd78e3d..ceecdcd02a1f5 100644 --- a/js/xpconnect/src/XPCJSRuntime.cpp +++ b/js/xpconnect/src/XPCJSRuntime.cpp @@ -26,8 +26,6 @@ #include "nsIMemoryInfoDumper.h" #include "nsIMemoryReporter.h" #include "nsIObserverService.h" -#include "nsIDebug2.h" -#include "nsIDocShell.h" #include "mozilla/dom/Document.h" #include "nsIRunnable.h" #include "nsIPlatformInfo.h" @@ -73,7 +71,6 @@ #include "GeckoProfiler.h" #include "NodeUbiReporting.h" #include "nsIInputStream.h" -#include "nsIXULRuntime.h" #include "nsJSPrincipals.h" #ifdef XP_WIN diff --git a/js/xpconnect/src/XPCRuntimeService.cpp b/js/xpconnect/src/XPCRuntimeService.cpp index 36ddad50d66ba..5c0680c614a08 100644 --- a/js/xpconnect/src/XPCRuntimeService.cpp +++ b/js/xpconnect/src/XPCRuntimeService.cpp @@ -8,7 +8,6 @@ #include "nsContentUtils.h" #include "BackstagePass.h" -#include "nsIPrincipal.h" #include "mozilla/dom/BindingUtils.h" #include "mozilla/dom/WebIDLGlobalNameHash.h" diff --git a/js/xpconnect/src/XPCWrappedNativeScope.cpp b/js/xpconnect/src/XPCWrappedNativeScope.cpp index fb42fbe6ccd9c..991a8f315395a 100644 --- a/js/xpconnect/src/XPCWrappedNativeScope.cpp +++ b/js/xpconnect/src/XPCWrappedNativeScope.cpp @@ -15,7 +15,6 @@ #include "mozilla/MemoryReporting.h" #include "mozilla/Preferences.h" #include "mozilla/Unused.h" -#include "nsIXULRuntime.h" #include "mozJSComponentLoader.h" #include "mozilla/dom/BindingUtils.h" diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp index 642c511330730..ebb530539fbc1 100644 --- a/js/xpconnect/src/nsXPConnect.cpp +++ b/js/xpconnect/src/nsXPConnect.cpp @@ -35,8 +35,6 @@ #include "nsIObjectInputStream.h" #include "nsIObjectOutputStream.h" #include "nsScriptSecurityManager.h" -#include "nsIPermissionManager.h" -#include "nsIScriptError.h" #include "nsContentUtils.h" #include "nsScriptError.h" #include "nsJSUtils.h" diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h index 3cc62e5ee8ce4..fde111f52a835 100644 --- a/js/xpconnect/src/xpcprivate.h +++ b/js/xpconnect/src/xpcprivate.h @@ -131,7 +131,6 @@ #include "nsIConsoleService.h" #include "nsVariant.h" -#include "nsIProperty.h" #include "nsCOMArray.h" #include "nsTArray.h" #include "nsBaseHashtable.h" diff --git a/js/xpconnect/tests/components/native/xpctest_returncode.cpp b/js/xpconnect/tests/components/native/xpctest_returncode.cpp index e3d89214957fe..d954e5b2d70b1 100644 --- a/js/xpconnect/tests/components/native/xpctest_returncode.cpp +++ b/js/xpconnect/tests/components/native/xpctest_returncode.cpp @@ -3,7 +3,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "xpctest_private.h" -#include "xpctest_interfaces.h" #include "nsComponentManagerUtils.h" NS_IMPL_ISUPPORTS(nsXPCTestReturnCodeParent, nsIXPCTestReturnCodeParent) diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp index ee52aabd06636..7026bd0e329a3 100644 --- a/js/xpconnect/wrappers/XrayWrapper.cpp +++ b/js/xpconnect/wrappers/XrayWrapper.cpp @@ -9,7 +9,9 @@ #include "WrapperFactory.h" #include "nsDependentString.h" +#include "nsIConsoleService.h" #include "nsIScriptError.h" +#include "nsIXPConnect.h" #include "mozilla/dom/Element.h" #include "mozilla/dom/ScriptSettings.h" diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp index 65e0fddf151c9..8c160f3c731cf 100644 --- a/layout/base/PresShell.cpp +++ b/layout/base/PresShell.cpp @@ -74,8 +74,6 @@ #include "nsCOMPtr.h" #include "nsReadableUtils.h" #include "nsPageSequenceFrame.h" -#include "nsIPermissionManager.h" -#include "nsIMozBrowserFrame.h" #include "nsCaret.h" #include "mozilla/AccessibleCaretEventHub.h" #include "nsFrameManager.h" @@ -170,7 +168,6 @@ #include "mozilla/Preferences.h" #include "mozilla/Telemetry.h" #include "nsCanvasFrame.h" -#include "nsIImageLoadingContent.h" #include "nsImageFrame.h" #include "nsIScreen.h" #include "nsIScreenManager.h" diff --git a/layout/base/PresShell.h b/layout/base/PresShell.h index eddb2777ac29c..1b0e98e46abbd 100644 --- a/layout/base/PresShell.h +++ b/layout/base/PresShell.h @@ -16,6 +16,7 @@ #include "GeckoProfiler.h" #include "TouchManager.h" #include "Units.h" +#include "Visibility.h" #include "ZoomConstraintsClient.h" #include "gfxPoint.h" #include "mozilla/ArenaObjectID.h" @@ -43,7 +44,6 @@ #include "nsFrameState.h" #include "nsHashKeys.h" #include "nsIContent.h" -#include "nsIImageLoadingContent.h" #include "nsIObserver.h" #include "nsISelectionController.h" #include "nsIWidget.h" diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp index 5fc44d5885277..e6b7212e129aa 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp @@ -70,7 +70,6 @@ #include "ClientLayerManager.h" #include "mozilla/dom/NotifyPaintEvent.h" -#include "nsIDOMChromeWindow.h" #include "nsFrameLoader.h" #include "nsContentUtils.h" #include "nsPIWindowRoot.h" diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h index d48405b57e9e0..e11f2f1b992bf 100644 --- a/layout/base/nsPresContext.h +++ b/layout/base/nsPresContext.h @@ -41,7 +41,6 @@ #include "mozilla/PresShellForwards.h" #include "prclist.h" #include "nsThreadUtils.h" -#include "nsIMessageManager.h" #include "Units.h" #include "prenv.h" #include "mozilla/StaticPresData.h" diff --git a/layout/base/nsStyleSheetService.cpp b/layout/base/nsStyleSheetService.cpp index 62ea7f52792bd..45fbd47e71d74 100644 --- a/layout/base/nsStyleSheetService.cpp +++ b/layout/base/nsStyleSheetService.cpp @@ -25,7 +25,6 @@ #include "nsISimpleEnumerator.h" #include "nsNetUtil.h" #include "nsIConsoleService.h" -#include "nsIObserverService.h" #include "nsLayoutStatics.h" #include "nsLayoutUtils.h" diff --git a/layout/build/nsContentDLF.cpp b/layout/build/nsContentDLF.cpp index 9fe72a911be27..37d8227d929f5 100644 --- a/layout/build/nsContentDLF.cpp +++ b/layout/build/nsContentDLF.cpp @@ -11,15 +11,10 @@ #include "nsDocShell.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" -#include "nsIComponentManager.h" -#include "nsIComponentRegistrar.h" #include "nsIContentViewer.h" -#include "nsICategoryManager.h" #include "nsIDocumentLoaderFactory.h" #include "mozilla/dom/Document.h" -#include "nsIURL.h" #include "nsNodeInfoManager.h" -#include "nsIScriptSecurityManager.h" #include "nsString.h" #include "nsContentCID.h" #include "nsNetUtil.h" @@ -32,7 +27,6 @@ #include "DecoderTraits.h" // plugins -#include "nsIPluginHost.h" #include "nsPluginHost.h" // Factory code for creating variations on html documents diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp index d8ff01fc67d0b..55f6f99e64718 100644 --- a/layout/build/nsLayoutModule.cpp +++ b/layout/build/nsLayoutModule.cpp @@ -36,7 +36,6 @@ #include "mozilla/dom/quota/QuotaManagerService.h" #include "nsIEventListenerService.h" -#include "nsIMessageManager.h" // view stuff #include "nsContentCreatorFunctions.h" diff --git a/layout/forms/nsButtonFrameRenderer.h b/layout/forms/nsButtonFrameRenderer.h index ab32ae91ef52a..879b2911dd7bf 100644 --- a/layout/forms/nsButtonFrameRenderer.h +++ b/layout/forms/nsButtonFrameRenderer.h @@ -7,7 +7,6 @@ #ifndef nsButtonFrameRenderer_h___ #define nsButtonFrameRenderer_h___ -#include "imgIContainer.h" #include "nsMargin.h" #include "nsCSSRenderingBorders.h" diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp index ba7b48793e9c3..d1eb0c2d3b74a 100644 --- a/layout/forms/nsComboboxControlFrame.cpp +++ b/layout/forms/nsComboboxControlFrame.cpp @@ -50,7 +50,6 @@ #include "mozilla/Unused.h" #include "gfx2DGlue.h" #include "mozilla/widget/nsAutoRollup.h" -#include "nsILayoutHistoryState.h" #ifdef XP_WIN # define COMBOBOX_ROLLUP_CONSUME_EVENT 0 diff --git a/layout/forms/nsDateTimeControlFrame.cpp b/layout/forms/nsDateTimeControlFrame.cpp index 1f1c34354b72f..e0f57dd39c483 100644 --- a/layout/forms/nsDateTimeControlFrame.cpp +++ b/layout/forms/nsDateTimeControlFrame.cpp @@ -20,7 +20,6 @@ #include "mozilla/dom/HTMLInputElement.h" #include "mozilla/dom/MutationEventBinding.h" #include "nsNodeInfoManager.h" -#include "nsIObserverService.h" #include "jsapi.h" #include "nsJSUtils.h" #include "nsThreadUtils.h" diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp index 8ecc76dacae4e..408fe59adb0c2 100644 --- a/layout/forms/nsListControlFrame.cpp +++ b/layout/forms/nsListControlFrame.cpp @@ -11,7 +11,6 @@ #include "nsCheckboxRadioFrame.h" // for COMPARE macro #include "nsGkAtoms.h" #include "nsComboboxControlFrame.h" -#include "nsIXULRuntime.h" #include "nsFontMetrics.h" #include "nsIScrollableFrame.h" #include "nsCSSRendering.h" diff --git a/layout/forms/nsNumberControlFrame.cpp b/layout/forms/nsNumberControlFrame.cpp index 0e017ed23c90b..f3043c12561d1 100644 --- a/layout/forms/nsNumberControlFrame.cpp +++ b/layout/forms/nsNumberControlFrame.cpp @@ -13,7 +13,6 @@ #include "mozilla/dom/MutationEventBinding.h" #include "HTMLInputElement.h" #include "ICUUtils.h" -#include "nsIFocusManager.h" #include "nsFocusManager.h" #include "nsFontMetrics.h" #include "nsCheckboxRadioFrame.h" diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp index b8accb357d8a4..9ab1fcce41cdb 100644 --- a/layout/forms/nsTextControlFrame.cpp +++ b/layout/forms/nsTextControlFrame.cpp @@ -14,7 +14,6 @@ #include "nsCaret.h" #include "nsCSSPseudoElements.h" #include "nsGenericHTMLElement.h" -#include "nsIEditor.h" #include "nsTextFragment.h" #include "nsNameSpaceManager.h" #include "nsCheckboxRadioFrame.h" //for registering accesskeys diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index f7d3c247acafc..d41fb3a85db82 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -76,7 +76,6 @@ #include "nsAnimationManager.h" // For triple-click pref -#include "imgIContainer.h" #include "imgIRequest.h" #include "nsError.h" #include "nsContainerFrame.h" diff --git a/layout/generic/nsFrameSelection.cpp b/layout/generic/nsFrameSelection.cpp index d7a74976b104f..772e582a4f004 100644 --- a/layout/generic/nsFrameSelection.cpp +++ b/layout/generic/nsFrameSelection.cpp @@ -31,7 +31,6 @@ #include "nsTableCellFrame.h" #include "nsIScrollableFrame.h" #include "nsCCUncollectableMarker.h" -#include "nsIDocumentEncoder.h" #include "nsTextFragment.h" #include #include "nsContentUtils.h" @@ -55,7 +54,6 @@ static NS_DEFINE_CID(kFrameTraversalCID, NS_FRAMETRAVERSAL_CID); #include "mozilla/MouseEvents.h" #include "mozilla/TextEvents.h" -#include "nsITimer.h" // notifications #include "mozilla/dom/Document.h" @@ -64,8 +62,6 @@ static NS_DEFINE_CID(kFrameTraversalCID, NS_FRAMETRAVERSAL_CID); #include "nsIClipboard.h" #include "nsIFrameInlines.h" -#include "nsIBidiKeyboard.h" - #include "nsError.h" #include "mozilla/AutoCopyListener.h" #include "mozilla/dom/Element.h" diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp index 0904a9b9f2e1b..5d6ce6a3af7e7 100644 --- a/layout/generic/nsGfxScrollFrame.cpp +++ b/layout/generic/nsGfxScrollFrame.cpp @@ -51,7 +51,6 @@ #include "FrameLayerBuilder.h" #include "nsSubDocumentFrame.h" #include "nsSVGOuterSVGFrame.h" -#include "nsIObjectLoadingContent.h" #include "mozilla/Attributes.h" #include "ScrollbarActivity.h" #include "nsRefreshDriver.h" @@ -60,7 +59,6 @@ #include "nsIScrollPositionListener.h" #include "StickyScrollContainer.h" #include "nsIFrameInlines.h" -#include "nsILayoutHistoryState.h" #include "gfxPlatform.h" #include "mozilla/StaticPrefs_apz.h" #include "mozilla/StaticPrefs_general.h" diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp index 105ccfd134713..5157192535305 100644 --- a/layout/generic/nsImageFrame.cpp +++ b/layout/generic/nsImageFrame.cpp @@ -48,7 +48,6 @@ #include "nsTransform2D.h" #include "nsImageMap.h" #include "nsILoadGroup.h" -#include "nsISupportsPriority.h" #include "nsNetUtil.h" #include "nsNetCID.h" #include "nsCSSRendering.h" diff --git a/layout/generic/nsImageMap.cpp b/layout/generic/nsImageMap.cpp index 1e47e31a9aa2c..e1032a274da23 100644 --- a/layout/generic/nsImageMap.cpp +++ b/layout/generic/nsImageMap.cpp @@ -22,7 +22,6 @@ #include "nsCoord.h" #include "nsIContentInlines.h" #include "nsIScriptError.h" -#include "nsIStringBundle.h" #include "nsContentUtils.h" #include "ImageLayers.h" diff --git a/layout/generic/nsPluginFrame.cpp b/layout/generic/nsPluginFrame.cpp index 1b27966fe3909..435bd247af815 100644 --- a/layout/generic/nsPluginFrame.cpp +++ b/layout/generic/nsPluginFrame.cpp @@ -28,7 +28,6 @@ #include "nsViewManager.h" #include "nsString.h" #include "nsGkAtoms.h" -#include "nsIPluginInstanceOwner.h" #include "nsNPAPIPluginInstance.h" #include "npapi.h" #include "nsIObjectLoadingContent.h" diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp index f7fc50602bfb3..46c565b7ce123 100644 --- a/layout/generic/nsSubDocumentFrame.cpp +++ b/layout/generic/nsSubDocumentFrame.cpp @@ -43,7 +43,6 @@ #include "FrameLayerBuilder.h" #include "nsPluginFrame.h" #include "nsContentUtils.h" -#include "nsIPermissionManager.h" #include "nsServiceManagerUtils.h" #include "nsQueryObject.h" #include "RetainedDisplayListBuilder.h" diff --git a/layout/generic/nsTextRunTransformations.cpp b/layout/generic/nsTextRunTransformations.cpp index 371ebbfaf4801..7836b33fcb5ce 100644 --- a/layout/generic/nsTextRunTransformations.cpp +++ b/layout/generic/nsTextRunTransformations.cpp @@ -18,7 +18,6 @@ #include "nsSpecialCasingData.h" #include "mozilla/gfx/2D.h" #include "nsTextFrameUtils.h" -#include "nsIPersistentProperties2.h" #include "GreekCasing.h" #include "IrishCasing.h" diff --git a/layout/inspector/InspectorUtils.cpp b/layout/inspector/InspectorUtils.cpp index 4c8a148156262..01631dd576786 100644 --- a/layout/inspector/InspectorUtils.cpp +++ b/layout/inspector/InspectorUtils.cpp @@ -12,12 +12,10 @@ #include "gfxTextRun.h" #include "nsArray.h" #include "nsAutoPtr.h" -#include "nsIServiceManager.h" #include "nsString.h" #include "nsIStyleSheetLinkingElement.h" #include "nsIContentInlines.h" #include "mozilla/dom/Document.h" -#include "nsIMutableArray.h" #include "ChildIterator.h" #include "nsComputedDOMStyle.h" #include "mozilla/EventStateManager.h" diff --git a/layout/inspector/inLayoutUtils.cpp b/layout/inspector/inLayoutUtils.cpp index 764d69b51d95f..9a158eb900ff5 100644 --- a/layout/inspector/inLayoutUtils.cpp +++ b/layout/inspector/inLayoutUtils.cpp @@ -8,9 +8,7 @@ #include "mozilla/dom/Document.h" #include "nsIContent.h" -#include "nsIContentViewer.h" #include "nsPIDOMWindow.h" -#include "nsIDocShell.h" #include "nsPresContext.h" #include "mozilla/EventStateManager.h" #include "mozilla/dom/DocumentInlines.h" diff --git a/layout/ipc/VsyncParent.cpp b/layout/ipc/VsyncParent.cpp index 28752ce735d50..c039af999b39e 100644 --- a/layout/ipc/VsyncParent.cpp +++ b/layout/ipc/VsyncParent.cpp @@ -10,7 +10,6 @@ #include "BackgroundParentImpl.h" #include "gfxPlatform.h" #include "mozilla/Unused.h" -#include "nsIThread.h" #include "nsThreadUtils.h" #include "VsyncSource.h" diff --git a/layout/painting/nsCSSRendering.cpp b/layout/painting/nsCSSRendering.cpp index 69e32cd3f5b4d..6b209526976d7 100644 --- a/layout/painting/nsCSSRendering.cpp +++ b/layout/painting/nsCSSRendering.cpp @@ -37,7 +37,6 @@ #include "nsIContent.h" #include "mozilla/dom/DocumentInlines.h" #include "nsIScrollableFrame.h" -#include "imgIRequest.h" #include "imgIContainer.h" #include "ImageOps.h" #include "nsCSSRendering.h" diff --git a/layout/painting/nsCSSRendering.h b/layout/painting/nsCSSRendering.h index 7c1518dca2237..ce3035003a96c 100644 --- a/layout/painting/nsCSSRendering.h +++ b/layout/painting/nsCSSRendering.h @@ -11,7 +11,6 @@ #include "gfxBlur.h" #include "gfxContext.h" -#include "imgIContainer.h" #include "mozilla/gfx/PathHelpers.h" #include "mozilla/gfx/Rect.h" #include "mozilla/TypedEnumBits.h" diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp index d5c5060bf0302..c9c367ca7103e 100644 --- a/layout/painting/nsDisplayList.cpp +++ b/layout/painting/nsDisplayList.cpp @@ -36,7 +36,6 @@ #include "mozilla/StaticPrefs_layout.h" #include "nsCSSRendering.h" #include "nsCSSRenderingGradients.h" -#include "nsISelectionController.h" #include "nsRegion.h" #include "nsStyleStructInlines.h" #include "nsStyleTransformMatrix.h" diff --git a/layout/painting/nsDisplayListInvalidation.h b/layout/painting/nsDisplayListInvalidation.h index 1200bbe7577cb..e88b6cdc08613 100644 --- a/layout/painting/nsDisplayListInvalidation.h +++ b/layout/painting/nsDisplayListInvalidation.h @@ -9,7 +9,6 @@ #include "mozilla/Attributes.h" #include "FrameLayerBuilder.h" -#include "imgIContainer.h" #include "nsRect.h" #include "nsColor.h" #include "gfxRect.h" diff --git a/layout/printing/PrintPreviewUserEventSuppressor.cpp b/layout/printing/PrintPreviewUserEventSuppressor.cpp index 29282fb61e6f6..8dcb73064d842 100644 --- a/layout/printing/PrintPreviewUserEventSuppressor.cpp +++ b/layout/printing/PrintPreviewUserEventSuppressor.cpp @@ -11,7 +11,6 @@ #include "mozilla/dom/Event.h" // for Event #include "nsPIDOMWindow.h" #include "mozilla/dom/Document.h" -#include "nsIDocShell.h" #include "nsPresContext.h" #include "nsFocusManager.h" #include "nsLiteralString.h" diff --git a/layout/printing/nsPagePrintTimer.cpp b/layout/printing/nsPagePrintTimer.cpp index 0ee3644f1e9b8..31453c44a4171 100644 --- a/layout/printing/nsPagePrintTimer.cpp +++ b/layout/printing/nsPagePrintTimer.cpp @@ -7,8 +7,6 @@ #include "nsPagePrintTimer.h" #include "mozilla/Unused.h" -#include "nsIContentViewer.h" -#include "nsIServiceManager.h" #include "nsPrintJob.h" using namespace mozilla; diff --git a/layout/printing/nsPrintData.cpp b/layout/printing/nsPrintData.cpp index 71bc2fd008516..a542ac69097d2 100644 --- a/layout/printing/nsPrintData.cpp +++ b/layout/printing/nsPrintData.cpp @@ -7,7 +7,6 @@ #include "nsPrintData.h" #include "nsIStringBundle.h" -#include "nsIServiceManager.h" #include "nsIWidget.h" #include "nsPrintObject.h" #include "nsIWebProgressListener.h" diff --git a/layout/printing/nsPrintData.h b/layout/printing/nsPrintData.h index 7757ed5400a65..c3bad6fa07981 100644 --- a/layout/printing/nsPrintData.h +++ b/layout/printing/nsPrintData.h @@ -12,13 +12,13 @@ // Interfaces #include "nsDeviceContext.h" -#include "nsIPrintProgressParams.h" #include "nsIPrintSettings.h" #include "nsISupportsImpl.h" #include "nsTArray.h" #include "nsCOMArray.h" class nsPrintObject; +class nsIPrintProgressParams; class nsIWebProgressListener; namespace mozilla { diff --git a/layout/printing/nsPrintJob.cpp b/layout/printing/nsPrintJob.cpp index 4b0f6e1b45cd7..345ff140634b2 100644 --- a/layout/printing/nsPrintJob.cpp +++ b/layout/printing/nsPrintJob.cpp @@ -7,7 +7,6 @@ #include "nsPrintJob.h" #include "nsDocShell.h" -#include "nsIStringBundle.h" #include "nsReadableUtils.h" #include "nsCRT.h" @@ -32,10 +31,8 @@ #include "nsIPrintSettingsService.h" #include "nsIPrintSession.h" #include "nsGfxCIID.h" -#include "nsIServiceManager.h" #include "nsGkAtoms.h" #include "nsXPCOM.h" -#include "nsISupportsPrimitives.h" static const char sPrintSettingsServiceContractID[] = "@mozilla.org/gfx/printsettings-service;1"; @@ -46,16 +43,11 @@ static const char sPrintSettingsServiceContractID[] = #include "nsIWebBrowserPrint.h" // Print Preview -#include "imgIContainer.h" // image animation mode constants // Print Progress -#include "nsIPrintProgress.h" -#include "nsIPrintProgressParams.h" #include "nsIObserver.h" // Print error dialog -#include "nsIPrompt.h" -#include "nsIWindowWatcher.h" // Printing Prompts #include "nsIPrintingPromptService.h" @@ -70,7 +62,6 @@ static const char kPrintingPromptService[] = #include "mozilla/dom/DocumentInlines.h" // Focus -#include "nsISelectionController.h" // Misc #include "gfxContext.h" @@ -79,7 +70,6 @@ static const char kPrintingPromptService[] = #include "nsISupportsUtils.h" #include "nsIScriptContext.h" #include "nsIDocumentObserver.h" -#include "nsISelectionListener.h" #include "nsContentCID.h" #include "nsLayoutCID.h" #include "nsContentUtils.h" @@ -94,14 +84,10 @@ static const char kPrintingPromptService[] = #include "nsViewManager.h" #include "nsPageSequenceFrame.h" -#include "nsIURL.h" -#include "nsIContentViewerEdit.h" #include "nsIInterfaceRequestor.h" #include "nsIInterfaceRequestorUtils.h" #include "nsIDocShellTreeOwner.h" #include "nsIWebBrowserChrome.h" -#include "nsIBaseWindow.h" -#include "nsILayoutHistoryState.h" #include "nsFrameManager.h" #include "mozilla/ReflowInput.h" #include "nsIContentViewer.h" @@ -114,7 +100,6 @@ static const char kPrintingPromptService[] = #include "mozilla/dom/Element.h" #include "mozilla/dom/HTMLFrameElement.h" #include "nsContentList.h" -#include "nsIChannel.h" #include "PrintPreviewUserEventSuppressor.h" #include "xpcpublic.h" #include "nsVariant.h" diff --git a/layout/style/CSS.cpp b/layout/style/CSS.cpp index 70d9f886e3528..0cd604ac0af3d 100644 --- a/layout/style/CSS.cpp +++ b/layout/style/CSS.cpp @@ -12,7 +12,6 @@ #include "mozilla/ServoBindings.h" #include "nsGlobalWindow.h" #include "mozilla/dom/Document.h" -#include "nsIURI.h" #include "nsStyleUtil.h" #include "xpcpublic.h" diff --git a/layout/style/CachedInheritingStyles.cpp b/layout/style/CachedInheritingStyles.cpp index 41446c62fa193..da6e4d24e66ff 100644 --- a/layout/style/CachedInheritingStyles.cpp +++ b/layout/style/CachedInheritingStyles.cpp @@ -8,7 +8,6 @@ #include "mozilla/ComputedStyle.h" #include "nsCOMPtr.h" -#include "nsIMemoryReporter.h" #include "nsWindowSizes.h" namespace mozilla { diff --git a/layout/style/ComputedStyle.h b/layout/style/ComputedStyle.h index 0f3e8099f5276..ef2792667b0b9 100644 --- a/layout/style/ComputedStyle.h +++ b/layout/style/ComputedStyle.h @@ -9,7 +9,6 @@ #ifndef _ComputedStyle_h_ #define _ComputedStyle_h_ -#include "nsIMemoryReporter.h" #include #include "mozilla/Assertions.h" #include "mozilla/CachedInheritingStyles.h" diff --git a/layout/style/DeclarationBlock.cpp b/layout/style/DeclarationBlock.cpp index bb4d562fe22c3..972fbebf1379d 100644 --- a/layout/style/DeclarationBlock.cpp +++ b/layout/style/DeclarationBlock.cpp @@ -10,7 +10,6 @@ #include "mozilla/ServoBindings.h" #include "nsCSSProps.h" -#include "nsIMemoryReporter.h" namespace mozilla { diff --git a/layout/style/ErrorReporter.cpp b/layout/style/ErrorReporter.cpp index 6af8ec4fea85d..3a5c36ef57a42 100644 --- a/layout/style/ErrorReporter.cpp +++ b/layout/style/ErrorReporter.cpp @@ -20,7 +20,6 @@ #include "nsIFactory.h" #include "nsINode.h" #include "nsIScriptError.h" -#include "nsISensitiveInfoHiddenURI.h" #include "nsIStringBundle.h" #include "nsServiceManagerUtils.h" #include "nsStyleUtil.h" diff --git a/layout/style/FontFaceSet.cpp b/layout/style/FontFaceSet.cpp index a94dfa0a0a326..f03c0691138c9 100644 --- a/layout/style/FontFaceSet.cpp +++ b/layout/style/FontFaceSet.cpp @@ -39,7 +39,6 @@ #include "nsIClassOfService.h" #include "nsIConsoleService.h" #include "nsIContentPolicy.h" -#include "nsIContentSecurityPolicy.h" #include "nsIDocShell.h" #include "mozilla/dom/Document.h" #include "nsILoadContext.h" @@ -48,7 +47,6 @@ #include "nsISupportsPriority.h" #include "nsIWebNavigation.h" #include "nsNetUtil.h" -#include "nsIProtocolHandler.h" #include "nsIInputStream.h" #include "nsLayoutUtils.h" #include "nsPresContext.h" diff --git a/layout/style/GeckoBindings.cpp b/layout/style/GeckoBindings.cpp index 10db33aaa92e5..1e7ae8003a318 100644 --- a/layout/style/GeckoBindings.cpp +++ b/layout/style/GeckoBindings.cpp @@ -23,14 +23,11 @@ #include "nsDOMTokenList.h" #include "nsDeviceContext.h" #include "nsIContentInlines.h" -#include "nsICrashReporter.h" #include "mozilla/dom/DocumentInlines.h" #include "nsILoadContext.h" #include "nsIFrame.h" -#include "nsIMemoryReporter.h" #include "nsIMozBrowserFrame.h" #include "nsINode.h" -#include "nsIPrincipal.h" #include "nsIURI.h" #include "nsFontMetrics.h" #include "nsHTMLStyleSheet.h" diff --git a/layout/style/Loader.cpp b/layout/style/Loader.cpp index c64fead4c2efe..d6528f5b6069b 100644 --- a/layout/style/Loader.cpp +++ b/layout/style/Loader.cpp @@ -29,7 +29,6 @@ #include "mozilla/dom/Document.h" #include "nsIURI.h" #include "nsNetUtil.h" -#include "nsIProtocolHandler.h" #include "nsContentUtils.h" #include "nsIScriptSecurityManager.h" #include "nsContentPolicyUtils.h" @@ -64,7 +63,6 @@ #include "nsError.h" -#include "nsIContentSecurityPolicy.h" #include "mozilla/dom/SRICheck.h" #include "mozilla/Encoding.h" diff --git a/layout/style/ServoStyleSet.h b/layout/style/ServoStyleSet.h index 8825180c741e3..26258225cdd38 100644 --- a/layout/style/ServoStyleSet.h +++ b/layout/style/ServoStyleSet.h @@ -24,6 +24,7 @@ #include "nsAtom.h" #include "nsIMemoryReporter.h" #include "nsTArray.h" +#include "nsIMemoryReporter.h" namespace mozilla { namespace css { diff --git a/layout/style/StyleSheet.cpp b/layout/style/StyleSheet.cpp index 3a19a6530656a..47765e2125401 100644 --- a/layout/style/StyleSheet.cpp +++ b/layout/style/StyleSheet.cpp @@ -24,7 +24,6 @@ #include "mozAutoDocUpdate.h" #include "SheetLoadData.h" -#include "nsIReferrerInfo.h" namespace mozilla { @@ -390,21 +389,21 @@ void StyleSheet::DropStyleSet(ServoStyleSet* aStyleSet) { // NOTE(emilio): Composed doc and containing shadow root are set in child sheets // too, so no need to do it for each ancestor. -#define NOTIFY(function_, args_) \ - do { \ - if (auto* shadow = GetContainingShadow()) { \ - shadow->function_ args_; \ - } \ - if (auto* doc = GetComposedDoc()) { \ - doc->function_ args_; \ - } \ - StyleSheet* current = this; \ - do { \ - for (ServoStyleSet* set : current->mStyleSets) { \ - set->function_ args_; \ - } \ - current = current->mParent; \ - } while (current); \ +#define NOTIFY(function_, args_) \ + do { \ + if (auto* shadow = GetContainingShadow()) { \ + shadow->function_ args_; \ + } \ + if (auto* doc = GetComposedDoc()) { \ + doc->function_ args_; \ + } \ + StyleSheet* current = this; \ + do { \ + for (ServoStyleSet * set : current->mStyleSets) { \ + set->function_ args_; \ + } \ + current = current->mParent; \ + } while (current); \ } while (0) void StyleSheet::EnsureUniqueInner() { diff --git a/layout/style/nsCSSValue.cpp b/layout/style/nsCSSValue.cpp index 18cd1b48bf311..114939b03a679 100644 --- a/layout/style/nsCSSValue.cpp +++ b/layout/style/nsCSSValue.cpp @@ -18,10 +18,8 @@ #include "mozilla/MemoryReporting.h" #include "mozilla/css/ImageLoader.h" #include "gfxFontConstants.h" -#include "imgIRequest.h" #include "imgRequestProxy.h" #include "mozilla/dom/Document.h" -#include "nsIURIMutator.h" #include "nsCSSProps.h" #include "nsNetUtil.h" #include "nsPresContext.h" diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp index ab0642e359c52..9f1781c7f5463 100644 --- a/layout/style/nsComputedDOMStyle.cpp +++ b/layout/style/nsComputedDOMStyle.cpp @@ -45,7 +45,6 @@ #include "mozilla/ServoStyleSet.h" #include "mozilla/RestyleManager.h" #include "mozilla/ViewportFrame.h" -#include "imgIRequest.h" #include "nsLayoutUtils.h" #include "nsCSSKeywords.h" #include "nsDisplayList.h" diff --git a/layout/style/nsDOMCSSAttrDeclaration.cpp b/layout/style/nsDOMCSSAttrDeclaration.cpp index 9b5d52728d3b0..7a75abdc6322f 100644 --- a/layout/style/nsDOMCSSAttrDeclaration.cpp +++ b/layout/style/nsDOMCSSAttrDeclaration.cpp @@ -17,7 +17,6 @@ #include "mozilla/SMILCSSValueType.h" #include "mozilla/SMILValue.h" #include "mozAutoDocUpdate.h" -#include "nsIURI.h" #include "nsWrapperCacheInlines.h" #include "nsIFrame.h" #include "ActiveLayerTracker.h" diff --git a/layout/style/nsDOMCSSDeclaration.cpp b/layout/style/nsDOMCSSDeclaration.cpp index d34e46f9eb542..615ca17225eee 100644 --- a/layout/style/nsDOMCSSDeclaration.cpp +++ b/layout/style/nsDOMCSSDeclaration.cpp @@ -16,7 +16,6 @@ #include "nsCSSProps.h" #include "nsCOMPtr.h" #include "mozAutoDocUpdate.h" -#include "nsIURI.h" #include "mozilla/dom/BindingUtils.h" #include "nsQueryObject.h" #include "mozilla/layers/ScrollLinkedEffectDetector.h" diff --git a/layout/style/nsDOMCSSDeclaration.h b/layout/style/nsDOMCSSDeclaration.h index 93f2aad5ee085..344f301a09771 100644 --- a/layout/style/nsDOMCSSDeclaration.h +++ b/layout/style/nsDOMCSSDeclaration.h @@ -15,7 +15,6 @@ #include "mozilla/Maybe.h" #include "mozilla/URLExtraData.h" #include "nsAttrValue.h" -#include "nsIURI.h" #include "nsCOMPtr.h" #include "nsCompatibility.h" diff --git a/layout/style/nsFontFaceLoader.cpp b/layout/style/nsFontFaceLoader.cpp index 0862567831f21..db389a16fbc7f 100644 --- a/layout/style/nsFontFaceLoader.cpp +++ b/layout/style/nsFontFaceLoader.cpp @@ -19,10 +19,7 @@ #include "mozilla/Unused.h" #include "FontFaceSet.h" #include "nsPresContext.h" -#include "nsIPrincipal.h" -#include "nsIScriptSecurityManager.h" #include "nsIHttpChannel.h" -#include "nsIContentPolicy.h" #include "nsIThreadRetargetableRequest.h" #include "nsContentPolicyUtils.h" #include "nsNetCID.h" diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp index b3e824626f194..272824dba1a9e 100644 --- a/layout/style/nsStyleStruct.cpp +++ b/layout/style/nsStyleStruct.cpp @@ -14,7 +14,6 @@ #include "nsStyleConsts.h" #include "nsString.h" #include "nsPresContext.h" -#include "nsIAppShellService.h" #include "nsIWidget.h" #include "nsCRTGlue.h" #include "nsCSSProps.h" diff --git a/layout/style/nsStyleUtil.cpp b/layout/style/nsStyleUtil.cpp index 5d22acb308706..71e5e715896e0 100644 --- a/layout/style/nsStyleUtil.cpp +++ b/layout/style/nsStyleUtil.cpp @@ -16,8 +16,6 @@ #include "nsStyleStruct.h" #include "nsIContentPolicy.h" #include "nsIContentSecurityPolicy.h" -#include "nsIURI.h" -#include "nsISupportsPrimitives.h" #include "nsLayoutUtils.h" #include "nsPrintfCString.h" #include diff --git a/layout/svg/nsSVGImageFrame.h b/layout/svg/nsSVGImageFrame.h index 9dc2d7c0dfd44..12d183c89f31e 100644 --- a/layout/svg/nsSVGImageFrame.h +++ b/layout/svg/nsSVGImageFrame.h @@ -13,7 +13,6 @@ #include "mozilla/gfx/2D.h" #include "imgIContainer.h" #include "nsContainerFrame.h" -#include "nsIImageLoadingContent.h" #include "nsLayoutUtils.h" #include "imgINotificationObserver.h" #include "SVGObserverUtils.h" diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp index 673923562b44b..47a094e5168ad 100644 --- a/layout/tables/nsTableCellFrame.cpp +++ b/layout/tables/nsTableCellFrame.cpp @@ -23,7 +23,6 @@ #include "nsAttrValueInlines.h" #include "nsHTMLParts.h" #include "nsGkAtoms.h" -#include "nsIServiceManager.h" #include "nsDisplayList.h" #include "nsLayoutUtils.h" #include "nsTextFrame.h" diff --git a/layout/tables/nsTableFrame.h b/layout/tables/nsTableFrame.h index 3de0d480ca71d..f5eb5345ed9b6 100644 --- a/layout/tables/nsTableFrame.h +++ b/layout/tables/nsTableFrame.h @@ -7,7 +7,6 @@ #include "mozilla/Attributes.h" #include "celldata.h" -#include "imgIContainer.h" #include "nscore.h" #include "nsContainerFrame.h" #include "nsStyleConsts.h" diff --git a/layout/tables/nsTableWrapperFrame.cpp b/layout/tables/nsTableWrapperFrame.cpp index 2facb1e81d098..ca91971649726 100644 --- a/layout/tables/nsTableWrapperFrame.cpp +++ b/layout/tables/nsTableWrapperFrame.cpp @@ -17,7 +17,6 @@ #include "prinrval.h" #include "nsGkAtoms.h" #include "nsHTMLParts.h" -#include "nsIServiceManager.h" #include "nsDisplayList.h" #include "nsLayoutUtils.h" #include "nsIFrameInlines.h" diff --git a/layout/tools/layout-debug/src/nsLayoutDebugCLH.cpp b/layout/tools/layout-debug/src/nsLayoutDebugCLH.cpp index d05bb03f99399..3c83856e08c5c 100644 --- a/layout/tools/layout-debug/src/nsLayoutDebugCLH.cpp +++ b/layout/tools/layout-debug/src/nsLayoutDebugCLH.cpp @@ -8,12 +8,13 @@ #include "nsArray.h" #include "nsString.h" #include "plstr.h" +#include "nsComponentManagerUtils.h" #include "nsCOMPtr.h" #include "nsIWindowWatcher.h" -#include "nsIServiceManager.h" #include "nsISupportsPrimitives.h" #include "nsICommandLine.h" #include "nsIURI.h" +#include "nsServiceManagerUtils.h" nsLayoutDebugCLH::nsLayoutDebugCLH() {} diff --git a/layout/tools/layout-debug/src/nsLayoutDebuggingTools.cpp b/layout/tools/layout-debug/src/nsLayoutDebuggingTools.cpp index 97cd3caa4dc87..49dc0f7fc15f3 100644 --- a/layout/tools/layout-debug/src/nsLayoutDebuggingTools.cpp +++ b/layout/tools/layout-debug/src/nsLayoutDebuggingTools.cpp @@ -12,7 +12,6 @@ #include "nsIPrintSettings.h" #include "nsIPrintSettingsService.h" -#include "nsIServiceManager.h" #include "nsAtom.h" #include "nsQuickSort.h" @@ -23,7 +22,6 @@ #include "nsLayoutCID.h" -#include "nsISelectionController.h" #include "mozilla/dom/Document.h" #include "mozilla/dom/Element.h" #include "mozilla/Preferences.h" diff --git a/layout/xul/nsBox.cpp b/layout/xul/nsBox.cpp index b26dc5b8f6ffb..5562d6c1d444d 100644 --- a/layout/xul/nsBox.cpp +++ b/layout/xul/nsBox.cpp @@ -15,7 +15,6 @@ #include "nsNameSpaceManager.h" #include "nsGkAtoms.h" #include "nsITheme.h" -#include "nsIServiceManager.h" #include "nsBoxLayout.h" #include "FrameLayerBuilder.h" #include "mozilla/dom/Attr.h" diff --git a/layout/xul/nsBoxFrame.cpp b/layout/xul/nsBoxFrame.cpp index b522ebb49bbb3..f14adba530719 100644 --- a/layout/xul/nsBoxFrame.cpp +++ b/layout/xul/nsBoxFrame.cpp @@ -59,7 +59,6 @@ #include "nsViewManager.h" #include "nsView.h" #include "nsCSSRendering.h" -#include "nsIServiceManager.h" #include "nsBoxLayout.h" #include "nsSprocketLayout.h" #include "nsIScrollableFrame.h" @@ -78,7 +77,6 @@ #include // Needed for Print Preview -#include "nsIURI.h" #include "mozilla/TouchEvents.h" diff --git a/layout/xul/nsDocElementBoxFrame.cpp b/layout/xul/nsDocElementBoxFrame.cpp index c1c5c4c50b164..0776ba0b7898b 100644 --- a/layout/xul/nsDocElementBoxFrame.cpp +++ b/layout/xul/nsDocElementBoxFrame.cpp @@ -17,7 +17,6 @@ #include "nsBoxFrame.h" #include "nsStackLayout.h" #include "nsIAnonymousContentCreator.h" -#include "nsIServiceManager.h" #include "nsNodeInfoManager.h" #include "nsContentCreatorFunctions.h" diff --git a/layout/xul/nsImageBoxFrame.cpp b/layout/xul/nsImageBoxFrame.cpp index cafe654eaac8b..735981496ca6d 100644 --- a/layout/xul/nsImageBoxFrame.cpp +++ b/layout/xul/nsImageBoxFrame.cpp @@ -27,8 +27,6 @@ #include "mozilla/dom/Document.h" #include "mozilla/dom/DocumentInlines.h" #include "nsImageMap.h" -#include "nsIURL.h" -#include "nsILoadGroup.h" #include "nsContainerFrame.h" #include "nsCSSRendering.h" #include "nsNameSpaceManager.h" @@ -36,7 +34,6 @@ #include "nsTransform2D.h" #include "nsITheme.h" -#include "nsIServiceManager.h" #include "nsIURI.h" #include "nsThreadUtils.h" #include "nsDisplayList.h" diff --git a/layout/xul/nsImageBoxFrame.h b/layout/xul/nsImageBoxFrame.h index dc225328c634d..4d3a0398db30c 100644 --- a/layout/xul/nsImageBoxFrame.h +++ b/layout/xul/nsImageBoxFrame.h @@ -9,9 +9,9 @@ #include "mozilla/Attributes.h" #include "nsLeafBoxFrame.h" -#include "imgILoader.h" #include "imgIRequest.h" #include "imgIContainer.h" +#include "imgINotificationObserver.h" class imgRequestProxy; class nsImageBoxFrame; diff --git a/layout/xul/nsMenuBarFrame.cpp b/layout/xul/nsMenuBarFrame.cpp index 4da38e3d11870..5dc90b0318581 100644 --- a/layout/xul/nsMenuBarFrame.cpp +++ b/layout/xul/nsMenuBarFrame.cpp @@ -5,7 +5,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsMenuBarFrame.h" -#include "nsIServiceManager.h" #include "nsIContent.h" #include "nsAtom.h" #include "nsPresContext.h" diff --git a/layout/xul/nsMenuBarListener.cpp b/layout/xul/nsMenuBarListener.cpp index bc4809a9f9a7c..2ef03af4a70ff 100644 --- a/layout/xul/nsMenuBarListener.cpp +++ b/layout/xul/nsMenuBarListener.cpp @@ -10,7 +10,6 @@ #include "nsPIWindowRoot.h" // Drag & Drop, Clipboard -#include "nsIServiceManager.h" #include "nsWidgetsCID.h" #include "nsCOMPtr.h" #include "nsIContent.h" diff --git a/layout/xul/nsMenuFrame.cpp b/layout/xul/nsMenuFrame.cpp index 588ba9b0a2921..671f687783d22 100644 --- a/layout/xul/nsMenuFrame.cpp +++ b/layout/xul/nsMenuFrame.cpp @@ -17,10 +17,8 @@ #include "nsMenuPopupFrame.h" #include "nsMenuBarFrame.h" #include "mozilla/dom/Document.h" -#include "nsIComponentManager.h" #include "nsBoxLayoutState.h" #include "nsIScrollableFrame.h" -#include "nsIServiceManager.h" #include "nsCSSFrameConstructor.h" #include "nsString.h" #include "nsReadableUtils.h" @@ -30,7 +28,6 @@ #include "nsDisplayList.h" #include "nsIReflowCallback.h" #include "nsISound.h" -#include "nsIDOMXULMenuListElement.h" #include "mozilla/Attributes.h" #include "mozilla/EventDispatcher.h" #include "mozilla/Likely.h" diff --git a/layout/xul/nsMenuPopupFrame.cpp b/layout/xul/nsMenuPopupFrame.cpp index 25029c8cfb46c..230a68b297f4b 100644 --- a/layout/xul/nsMenuPopupFrame.cpp +++ b/layout/xul/nsMenuPopupFrame.cpp @@ -21,7 +21,6 @@ #include "nsFrameManager.h" #include "mozilla/dom/Document.h" #include "nsRect.h" -#include "nsIComponentManager.h" #include "nsBoxLayoutState.h" #include "nsIScrollableFrame.h" #include "nsIPopupContainer.h" @@ -37,12 +36,11 @@ #include "nsIBaseWindow.h" #include "nsISound.h" #include "nsIScreenManager.h" -#include "nsIServiceManager.h" #include "nsStyleConsts.h" #include "nsStyleStructInlines.h" #include "nsTransitionManager.h" #include "nsDisplayList.h" -#include "nsIDOMXULSelectCntrlItemEl.h" +#include "nsIDOMXULSelectCntrlEl.h" #include "mozilla/AnimationUtils.h" #include "mozilla/BasePrincipal.h" #include "mozilla/EventDispatcher.h" diff --git a/layout/xul/nsMenuPopupFrame.h b/layout/xul/nsMenuPopupFrame.h index 010f8d7731c9d..de0553f3e2857 100644 --- a/layout/xul/nsMenuPopupFrame.h +++ b/layout/xul/nsMenuPopupFrame.h @@ -14,7 +14,6 @@ #include "mozilla/Attributes.h" #include "mozilla/gfx/Types.h" #include "nsAtom.h" -#include "nsIDOMXULSelectCntrlEl.h" #include "nsGkAtoms.h" #include "nsCOMPtr.h" #include "nsMenuFrame.h" @@ -22,8 +21,6 @@ #include "nsBoxFrame.h" #include "nsMenuParent.h" -#include "nsITimer.h" - #include "Units.h" class nsIWidget; diff --git a/layout/xul/nsRepeatService.cpp b/layout/xul/nsRepeatService.cpp index dff2545fa738c..b23c17396e4ea 100644 --- a/layout/xul/nsRepeatService.cpp +++ b/layout/xul/nsRepeatService.cpp @@ -14,7 +14,6 @@ #include "nsRepeatService.h" #include "mozilla/StaticPtr.h" #include "mozilla/dom/Document.h" -#include "nsIServiceManager.h" using namespace mozilla; diff --git a/layout/xul/nsResizerFrame.cpp b/layout/xul/nsResizerFrame.cpp index e88fbec0f97d8..58d2e8b455302 100644 --- a/layout/xul/nsResizerFrame.cpp +++ b/layout/xul/nsResizerFrame.cpp @@ -6,7 +6,6 @@ #include "nsAutoPtr.h" #include "nsCOMPtr.h" -#include "nsIServiceManager.h" #include "nsResizerFrame.h" #include "nsIContent.h" #include "mozilla/PresShell.h" diff --git a/layout/xul/nsScrollbarButtonFrame.h b/layout/xul/nsScrollbarButtonFrame.h index 95e29d13cf2f6..aa30aeca4299c 100644 --- a/layout/xul/nsScrollbarButtonFrame.h +++ b/layout/xul/nsScrollbarButtonFrame.h @@ -16,7 +16,6 @@ #include "mozilla/Attributes.h" #include "nsButtonBoxFrame.h" -#include "nsITimer.h" #include "nsRepeatService.h" namespace mozilla { diff --git a/layout/xul/nsSliderFrame.cpp b/layout/xul/nsSliderFrame.cpp index 9a2ddd3134a28..99dc042143865 100644 --- a/layout/xul/nsSliderFrame.cpp +++ b/layout/xul/nsSliderFrame.cpp @@ -29,7 +29,6 @@ #include "nsRepeatService.h" #include "nsBoxLayoutState.h" #include "nsSprocketLayout.h" -#include "nsIServiceManager.h" #include "nsContentUtils.h" #include "nsLayoutUtils.h" #include "nsDisplayList.h" diff --git a/layout/xul/nsSplitterFrame.cpp b/layout/xul/nsSplitterFrame.cpp index 491fa6f81c373..e5c44a9232dcd 100644 --- a/layout/xul/nsSplitterFrame.cpp +++ b/layout/xul/nsSplitterFrame.cpp @@ -24,7 +24,6 @@ #include "nsHTMLParts.h" #include "mozilla/ComputedStyle.h" #include "nsBoxLayoutState.h" -#include "nsIServiceManager.h" #include "nsContainerFrame.h" #include "nsContentCID.h" #include "nsLayoutUtils.h" diff --git a/layout/xul/nsTextBoxFrame.cpp b/layout/xul/nsTextBoxFrame.cpp index 81edc06902d3c..da83f6b3d09ce 100644 --- a/layout/xul/nsTextBoxFrame.cpp +++ b/layout/xul/nsTextBoxFrame.cpp @@ -26,7 +26,6 @@ #include "nsBoxLayoutState.h" #include "nsMenuBarListener.h" #include "nsString.h" -#include "nsIServiceManager.h" #include "nsITheme.h" #include "nsUnicharUtils.h" #include "nsContentUtils.h" diff --git a/layout/xul/nsXULPopupManager.cpp b/layout/xul/nsXULPopupManager.cpp index 770ab52a551e8..ca029e1f99ded 100644 --- a/layout/xul/nsXULPopupManager.cpp +++ b/layout/xul/nsXULPopupManager.cpp @@ -12,14 +12,12 @@ #include "nsMenuBarListener.h" #include "nsContentUtils.h" #include "nsXULElement.h" -#include "nsIDOMXULMenuListElement.h" #include "nsIDOMXULCommandDispatcher.h" #include "nsCSSFrameConstructor.h" #include "nsGlobalWindow.h" #include "nsIContentInlines.h" #include "nsLayoutUtils.h" #include "nsViewManager.h" -#include "nsIComponentManager.h" #include "nsITimer.h" #include "nsFocusManager.h" #include "nsIDocShell.h" diff --git a/layout/xul/nsXULTooltipListener.cpp b/layout/xul/nsXULTooltipListener.cpp index 7046b4115df6e..88a208d62cffb 100644 --- a/layout/xul/nsXULTooltipListener.cpp +++ b/layout/xul/nsXULTooltipListener.cpp @@ -10,7 +10,6 @@ #include "mozilla/dom/Document.h" #include "nsGkAtoms.h" #include "nsMenuPopupFrame.h" -#include "nsIServiceManager.h" #include "nsIDragService.h" #include "nsIDragSession.h" #ifdef MOZ_XUL diff --git a/layout/xul/tree/nsTreeBodyFrame.cpp b/layout/xul/tree/nsTreeBodyFrame.cpp index 91837a7eef7b2..2836e8a0c8af8 100644 --- a/layout/xul/tree/nsTreeBodyFrame.cpp +++ b/layout/xul/tree/nsTreeBodyFrame.cpp @@ -44,7 +44,6 @@ #include "nsWidgetsCID.h" #include "nsIFrameInlines.h" #include "nsBoxFrame.h" -#include "nsIURL.h" #include "nsBoxLayoutState.h" #include "nsTreeContentView.h" #include "nsTreeUtils.h" @@ -52,7 +51,6 @@ #include "nsITheme.h" #include "imgIRequest.h" #include "imgIContainer.h" -#include "imgILoader.h" #include "mozilla/dom/NodeInfo.h" #include "nsContentUtils.h" #include "nsLayoutUtils.h" diff --git a/media/mtransport/WebrtcTCPSocketWrapper.cpp b/media/mtransport/WebrtcTCPSocketWrapper.cpp index c851e4c91e7fb..e72cf0beb614f 100644 --- a/media/mtransport/WebrtcTCPSocketWrapper.cpp +++ b/media/mtransport/WebrtcTCPSocketWrapper.cpp @@ -10,7 +10,6 @@ #include "ipc/WebrtcTCPSocket.h" #include "mozilla/LoadInfo.h" -#include "nsIEventTarget.h" #include "nsNetCID.h" #include "nsProxyRelease.h" diff --git a/media/mtransport/ipc/StunAddrsRequestParent.h b/media/mtransport/ipc/StunAddrsRequestParent.h index 06d3f26c711fb..6be81511331fe 100644 --- a/media/mtransport/ipc/StunAddrsRequestParent.h +++ b/media/mtransport/ipc/StunAddrsRequestParent.h @@ -7,9 +7,6 @@ #include "mozilla/net/PStunAddrsRequestParent.h" -#include "nsICancelable.h" -#include "nsIDNSServiceDiscovery.h" - struct MDNSService; namespace mozilla { diff --git a/media/mtransport/ipc/WebrtcTCPSocket.cpp b/media/mtransport/ipc/WebrtcTCPSocket.cpp index 53df847b1a265..ee8cb16651502 100644 --- a/media/mtransport/ipc/WebrtcTCPSocket.cpp +++ b/media/mtransport/ipc/WebrtcTCPSocket.cpp @@ -10,7 +10,6 @@ #include "nsIChannel.h" #include "nsIClassOfService.h" #include "nsIContentPolicy.h" -#include "nsIEventTarget.h" #include "nsIIOService.h" #include "nsILoadInfo.h" #include "nsIProtocolProxyService.h" diff --git a/media/mtransport/nr_socket_prsock.cpp b/media/mtransport/nr_socket_prsock.cpp index a5b94d1b2449d..0855a5c9fb50b 100644 --- a/media/mtransport/nr_socket_prsock.cpp +++ b/media/mtransport/nr_socket_prsock.cpp @@ -110,8 +110,6 @@ nrappkit copyright: #include "mozilla/SyncRunnable.h" #include "nsTArray.h" #include "mozilla/SystemGroup.h" -#include "nsIPrefService.h" -#include "nsIPrefBranch.h" #include "nsISocketFilter.h" #include "nsDebug.h" #include "nsNetUtil.h" diff --git a/media/mtransport/nr_socket_prsock.h b/media/mtransport/nr_socket_prsock.h index 30c7d33f6b605..51ea944f7e330 100644 --- a/media/mtransport/nr_socket_prsock.h +++ b/media/mtransport/nr_socket_prsock.h @@ -54,7 +54,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "nsAutoPtr.h" #include "nsCOMPtr.h" #include "nsASocketHandler.h" -#include "nsISocketTransportService.h" #include "nsXPCOM.h" #include "nsIEventTarget.h" #include "nsIUDPSocketChild.h" diff --git a/media/mtransport/nricectx.cpp b/media/mtransport/nricectx.cpp index 79593c0400af0..2ecd8a175f4c5 100644 --- a/media/mtransport/nricectx.cpp +++ b/media/mtransport/nricectx.cpp @@ -56,8 +56,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "nsCOMPtr.h" #include "nsComponentManagerUtils.h" #include "nsError.h" -#include "nsIEventTarget.h" -#include "nsIUUIDGenerator.h" #include "nsNetCID.h" #include "nsComponentManagerUtils.h" #include "nsServiceManagerUtils.h" diff --git a/media/mtransport/nricectx.h b/media/mtransport/nricectx.h index 10f9f191d9444..74c486bdf5d20 100644 --- a/media/mtransport/nricectx.h +++ b/media/mtransport/nricectx.h @@ -63,7 +63,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "mozilla/UniquePtr.h" #include "nsAutoPtr.h" #include "nsIEventTarget.h" -#include "nsITimer.h" #include "nsTArray.h" #include "m_cpp_utils.h" diff --git a/media/mtransport/nricemediastream.h b/media/mtransport/nricemediastream.h index 2065633c08ca3..e220c3fb80987 100644 --- a/media/mtransport/nricemediastream.h +++ b/media/mtransport/nricemediastream.h @@ -52,8 +52,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "mozilla/RefPtr.h" #include "mozilla/UniquePtr.h" #include "nsCOMPtr.h" -#include "nsIEventTarget.h" -#include "nsITimer.h" #include "m_cpp_utils.h" diff --git a/media/mtransport/test/runnable_utils_unittest.cpp b/media/mtransport/test/runnable_utils_unittest.cpp index c8e0311e4a9e1..597a2fa9c246a 100644 --- a/media/mtransport/test/runnable_utils_unittest.cpp +++ b/media/mtransport/test/runnable_utils_unittest.cpp @@ -14,11 +14,6 @@ #include "nsXPCOM.h" #include "mozilla/RefPtr.h" -#include "nsIComponentManager.h" -#include "nsIComponentRegistrar.h" -#include "nsIIOService.h" -#include "nsIServiceManager.h" -#include "nsISocketTransportService.h" #include "nsASocketHandler.h" #include "nsServiceManagerUtils.h" diff --git a/media/mtransport/test/sockettransportservice_unittest.cpp b/media/mtransport/test/sockettransportservice_unittest.cpp index b5b352a000d2a..ffaf6bed4fd47 100644 --- a/media/mtransport/test/sockettransportservice_unittest.cpp +++ b/media/mtransport/test/sockettransportservice_unittest.cpp @@ -13,10 +13,6 @@ #include "nsNetCID.h" #include "nsXPCOM.h" -#include "nsIComponentManager.h" -#include "nsIComponentRegistrar.h" -#include "nsIIOService.h" -#include "nsIServiceManager.h" #include "nsISocketTransportService.h" #include "nsASocketHandler.h" diff --git a/media/mtransport/transportlayerdtls.cpp b/media/mtransport/transportlayerdtls.cpp index ef39eace466bc..fb97aee1410d5 100644 --- a/media/mtransport/transportlayerdtls.cpp +++ b/media/mtransport/transportlayerdtls.cpp @@ -21,7 +21,6 @@ #include "nsCOMPtr.h" #include "nsComponentManagerUtils.h" #include "nsComponentManagerUtils.h" -#include "nsIEventTarget.h" #include "nsNetCID.h" #include "nsServiceManagerUtils.h" #include "sslexp.h" diff --git a/media/mtransport/transportlayerdtls.h b/media/mtransport/transportlayerdtls.h index 10b3a57bb18e4..9215da6ffafc5 100644 --- a/media/mtransport/transportlayerdtls.h +++ b/media/mtransport/transportlayerdtls.h @@ -24,7 +24,6 @@ #include "mozilla/UniquePtr.h" #include "mozilla/TimeStamp.h" #include "nsCOMPtr.h" -#include "nsIEventTarget.h" #include "nsITimer.h" #include "ScopedNSSTypes.h" #include "m_cpp_utils.h" diff --git a/media/mtransport/transportlayerice.cpp b/media/mtransport/transportlayerice.cpp index 1dcd3b5eee29a..cdc5dd5fe43a6 100644 --- a/media/mtransport/transportlayerice.cpp +++ b/media/mtransport/transportlayerice.cpp @@ -46,7 +46,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "nsCOMPtr.h" #include "nsComponentManagerUtils.h" #include "nsError.h" -#include "nsIEventTarget.h" #include "nsNetCID.h" #include "nsComponentManagerUtils.h" #include "nsServiceManagerUtils.h" diff --git a/media/mtransport/transportlayerice.h b/media/mtransport/transportlayerice.h index 194181e05c7da..bbbcb9eafa222 100644 --- a/media/mtransport/transportlayerice.h +++ b/media/mtransport/transportlayerice.h @@ -16,8 +16,6 @@ #include "mozilla/RefPtr.h" #include "nsCOMPtr.h" -#include "nsIEventTarget.h" -#include "nsITimer.h" #include "m_cpp_utils.h" diff --git a/media/mtransport/transportlayerloopback.cpp b/media/mtransport/transportlayerloopback.cpp index 37eb38f75bf3e..be35f3b6206d1 100644 --- a/media/mtransport/transportlayerloopback.cpp +++ b/media/mtransport/transportlayerloopback.cpp @@ -11,13 +11,7 @@ #include "prlock.h" #include "nsNetCID.h" -#include "nsIComponentManager.h" #include "nsComponentManagerUtils.h" -#include "nsIComponentRegistrar.h" -#include "nsIEventTarget.h" -#include "nsIIOService.h" -#include "nsIServiceManager.h" -#include "nsISocketTransportService.h" #include "nsServiceManagerUtils.h" #include "nsString.h" diff --git a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp index 756ba8fd3291b..301d8bbb23603 100644 --- a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp +++ b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp @@ -15,8 +15,6 @@ #include "nsCOMPtr.h" #include "mozilla/media/MediaUtils.h" #include "nsServiceManagerUtils.h" -#include "nsIPrefService.h" -#include "nsIPrefBranch.h" #include "nsThreadUtils.h" #include "mozilla/Telemetry.h" #include "mtransport/runnable_utils.h" diff --git a/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp b/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp index e605b58e9a1fa..ffc14c64769ec 100644 --- a/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp +++ b/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp @@ -10,7 +10,6 @@ #include "gmp-video-frame-encoded.h" #include "GMPLog.h" #include "MainThreadUtils.h" -#include "mozIGeckoMediaPluginService.h" #include "mozilla/CheckedInt.h" #include "mozilla/EndianUtils.h" #include "mozilla/IntegerPrintfMacros.h" diff --git a/media/webrtc/signaling/src/peerconnection/MediaTransportHandler.cpp b/media/webrtc/signaling/src/peerconnection/MediaTransportHandler.cpp index 614c4bf039773..42b69d8fac5f3 100644 --- a/media/webrtc/signaling/src/peerconnection/MediaTransportHandler.cpp +++ b/media/webrtc/signaling/src/peerconnection/MediaTransportHandler.cpp @@ -12,7 +12,6 @@ #include "transportlayersrtp.h" // Config stuff -#include "nsIPrefService.h" #include "mozilla/dom/RTCConfigurationBinding.h" // Parsing STUN/TURN URIs diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp index e75c9d230b647..ee2bb7053d864 100644 --- a/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp +++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp @@ -20,7 +20,6 @@ #include "nsServiceManagerUtils.h" // do_GetService #include "nsIObserverService.h" #include "nsIObserver.h" -#include "nsIIOService.h" // NS_IOSERVICE_* #include "mozilla/Services.h" #include "mozilla/StaticPtr.h" diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp index 01fc34a1caf52..3d5db9751c49f 100644 --- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp +++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp @@ -20,13 +20,7 @@ #include "nsNetCID.h" #include "nsILoadContext.h" -#include "nsIProperty.h" -#include "nsIPropertyBag2.h" -#include "nsIServiceManager.h" -#include "nsISimpleEnumerator.h" #include "nsServiceManagerUtils.h" -#include "nsISocketTransportService.h" -#include "nsIConsoleService.h" #include "nsThreadUtils.h" #include "nsIPrefService.h" #include "nsIPrefBranch.h" @@ -37,6 +31,7 @@ #include "VideoConduit.h" #include "MediaTrackGraph.h" #include "runnable_utils.h" +#include "IPeerConnection.h" #include "PeerConnectionCtx.h" #include "PeerConnectionImpl.h" #include "PeerConnectionMedia.h" @@ -73,11 +68,9 @@ #include "nsXULAppAPI.h" #include "nsContentUtils.h" #include "nsDOMJSUtils.h" -#include "nsIScriptError.h" #include "nsPrintfCString.h" #include "nsURLHelper.h" #include "nsNetUtil.h" -#include "nsIURLParser.h" #include "js/ArrayBuffer.h" // JS::NewArrayBufferWithContents #include "js/GCAnnotations.h" // JS_HAZ_ROOTED #include "js/RootingAPI.h" // JS::{{,Mutable}Handle,Rooted} diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h index b6d5dea6af41b..82ef3fe5a84d0 100644 --- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h +++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h @@ -13,7 +13,6 @@ #include "prlock.h" #include "mozilla/RefPtr.h" #include "nsAutoPtr.h" -#include "IPeerConnection.h" #include "nsComponentManagerUtils.h" #include "nsPIDOMWindow.h" #include "nsIUUIDGenerator.h" @@ -40,7 +39,6 @@ #include "VideoUtils.h" #include "VideoSegment.h" #include "mozilla/dom/RTCStatsReportBinding.h" -#include "nsIPrincipal.h" #include "mozilla/PeerIdentity.h" #include "RTCStatsReport.h" diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp index 4c87897a5777d..d2363bdfa6316 100644 --- a/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp +++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp @@ -14,12 +14,8 @@ #include "signaling/src/jsep/JsepTransport.h" #include "nsContentUtils.h" -#include "nsIURI.h" -#include "nsIScriptSecurityManager.h" -#include "nsICancelable.h" #include "nsIIDNService.h" #include "nsILoadInfo.h" -#include "nsIContentPolicy.h" #include "nsIProxyInfo.h" #include "nsIPrincipal.h" #include "mozilla/LoadInfo.h" diff --git a/netwerk/cookie/nsCookie.h b/netwerk/cookie/nsCookie.h index 7af541cc08db2..a0a7eb7b6c33f 100644 --- a/netwerk/cookie/nsCookie.h +++ b/netwerk/cookie/nsCookie.h @@ -7,6 +7,7 @@ #define nsCookie_h__ #include "nsICookie.h" +#include "nsIMemoryReporter.h" #include "nsString.h" #include "mozilla/MemoryReporting.h" diff --git a/widget/android/ImageDecoderSupport.cpp b/widget/android/ImageDecoderSupport.cpp index 93eec098af923..9ab7442723b44 100644 --- a/widget/android/ImageDecoderSupport.cpp +++ b/widget/android/ImageDecoderSupport.cpp @@ -4,6 +4,7 @@ #include "ImageDecoderSupport.h" +#include "imgINotificationObserver.h" #include "imgITools.h" #include "gfxUtils.h" #include "AndroidGraphics.h"