Bug 1678062 - Remove unnecessary includes. r=andi

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

Depends on D96561

accessible/aom/AccessibleNode.h

@@ -10,7 +10,6 @@
 #include "nsDataHashtable.h"
 #include "nsRefPtrHashtable.h"
 #include "nsWrapperCache.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/DOMString.h"
 #include "mozilla/dom/Nullable.h"
@@ -19,6 +18,8 @@ class nsINode;
 
 namespace mozilla {
 
+class ErrorResult;
+
 namespace a11y {
 class Accessible;
 }

devtools/shared/heapsnapshot/DominatorTree.h

@@ -8,12 +8,13 @@
 
 #include "mozilla/devtools/HeapSnapshot.h"
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/RefCounted.h"
 #include "js/UbiNodeDominatorTree.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace devtools {
 
 class DominatorTree final : public nsISupports, public nsWrapperCache {

devtools/shared/heapsnapshot/HeapSnapshot.h

@@ -7,7 +7,6 @@
 #define mozilla_devtools_HeapSnapshot__
 
 #include "js/HashTable.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/devtools/DeserializedNode.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/Nullable.h"
@@ -27,6 +26,8 @@
 #include "nsXPCOM.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace devtools {
 
 class DominatorTree;

docshell/base/BrowsingContext.h

@@ -15,7 +15,6 @@
 #include "mozilla/RefPtr.h"
 #include "mozilla/Span.h"
 #include "mozilla/Tuple.h"
-#include "mozilla/WeakPtr.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/FeaturePolicy.h"
 #include "mozilla/dom/LocationBase.h"

docshell/base/SyncedContext.h

@@ -7,12 +7,16 @@
 #ifndef mozilla_dom_SyncedContext_h
 #define mozilla_dom_SyncedContext_h
 
-#include "mozilla/EnumSet.h"
-#include "mozilla/ErrorResult.h"
-#include "mozilla/Maybe.h"
-#include "mozilla/RefPtr.h"
-#include "mozilla/Tuple.h"
+#include <array>
+#include <type_traits>
 #include <utility>
+#include "mozilla/Attributes.h"
+#include "mozilla/EnumSet.h"
+#include "nsStringFwd.h"
+#include "nscore.h"
+
+// Referenced via macro definitions
+#include "mozilla/ErrorResult.h"
 
 class PickleIterator;
 
@@ -31,6 +35,8 @@ struct IPDLParamTraits;
 namespace dom {
 class ContentParent;
 class ContentChild;
+template <typename T>
+class MaybeDiscarded;
 
 namespace syncedcontext {
 

docshell/base/WindowContext.h

@@ -9,7 +9,6 @@
 
 #include "mozilla/PermissionDelegateHandler.h"
 #include "mozilla/Span.h"
-#include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/MaybeDiscarded.h"
 #include "mozilla/dom/SyncedContext.h"
 #include "mozilla/dom/UserActivation.h"
@@ -27,6 +26,7 @@ namespace dom {
 
 class WindowGlobalParent;
 class WindowGlobalInit;
+class BrowsingContext;
 class BrowsingContextGroup;
 
 #define MOZ_EACH_WC_FIELD(FIELD)                                       \

docshell/base/nsILoadContext.idl

@@ -14,7 +14,9 @@ webidl Element;
 
 %{C++
 #ifdef MOZILLA_INTERNAL_API
-#include "mozilla/BasePrincipal.h" // for OriginAttributes
+namespace mozilla {
+class OriginAttributes;
+}
 #endif
 %}
 

docshell/shistory/ChildSHistory.h

@@ -21,9 +21,9 @@
 
 #include "nsCOMPtr.h"
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/ErrorResult.h"
 #include "nsWrapperCache.h"
 #include "nsThreadUtils.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/LinkedList.h"
 #include "nsID.h"
 

dom/abort/AbortController.h

@@ -8,7 +8,6 @@
 #define mozilla_dom_AbortController_h
 
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
@@ -16,6 +15,8 @@
 class nsIGlobalObject;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class AbortSignal;

dom/animation/CSSPseudoElement.h

@@ -9,7 +9,6 @@
 
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/RefPtr.h"
 #include "nsCSSPseudoElements.h"

dom/base/BodyConsumer.h

@@ -10,7 +10,6 @@
 #include "mozilla/dom/AbortSignal.h"
 #include "mozilla/dom/MutableBlobStorage.h"
 #include "nsIInputStreamPump.h"
-#include "nsNetUtil.h"
 #include "nsIObserver.h"
 #include "nsWeakReference.h"
 

dom/base/BodyStream.h

@@ -15,7 +15,6 @@
 #include "nsISupportsImpl.h"
 #include "nsNetCID.h"
 #include "nsWeakReference.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Mutex.h"
 
 class nsIGlobalObject;
@@ -23,6 +22,8 @@ class nsIGlobalObject;
 class nsIInputStream;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class BodyStream;

dom/base/BodyUtil.h

@@ -10,11 +10,12 @@
 #include "nsString.h"
 #include "nsError.h"
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/FormData.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class BodyUtil final {

dom/base/ChromeUtils.cpp

@@ -13,28 +13,21 @@
 #include "WrapperFactory.h"
 
 #include "mozilla/Base64.h"
-#include "mozilla/BasePrincipal.h"
 #include "mozilla/CycleCollectedJSRuntime.h"
 #include "mozilla/IntentionalCrash.h"
 #include "mozilla/PerformanceMetricsCollector.h"
 #include "mozilla/PerfStats.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/ProcInfo.h"
-#include "mozilla/RDDProcessManager.h"
 #include "mozilla/ResultExtensions.h"
 #include "mozilla/SharedStyleSheetCache.h"
 #include "mozilla/TimeStamp.h"
-#include "mozilla/dom/BrowsingContext.h"
-#include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/IdleDeadline.h"
 #include "mozilla/dom/InProcessParent.h"
-#include "mozilla/dom/InProcessChild.h"
 #include "mozilla/dom/JSActorService.h"
-#include "mozilla/dom/MediaMetadata.h"
 #include "mozilla/dom/MediaSessionBinding.h"
 #include "mozilla/dom/PBrowserParent.h"
-#include "mozilla/dom/PWindowGlobalParent.h"
 #include "mozilla/dom/Performance.h"
 #include "mozilla/dom/PopupBlocker.h"
 #include "mozilla/dom/Promise.h"
@@ -43,12 +36,9 @@
 #include "mozilla/dom/WindowBinding.h"  // For IdleRequestCallback/Options
 #include "mozilla/dom/WindowGlobalParent.h"
 #include "mozilla/dom/WorkerPrivate.h"
-#include "mozilla/gfx/GPUProcessManager.h"
 #include "mozilla/ipc/GeckoChildProcessHost.h"
 #include "mozilla/net/UrlClassifierFeatureFactory.h"
-#include "mozilla/net/SocketProcessHost.h"
 #include "IOActivityMonitor.h"
-#include "nsIOService.h"
 #include "nsThreadUtils.h"
 #include "mozJSComponentLoader.h"
 #include "GeckoProfiler.h"

dom/base/ChromeUtils.h

@@ -11,13 +11,14 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/ChromeUtilsBinding.h"
 #include "mozilla/dom/Exceptions.h"
-#include "mozilla/ErrorResult.h"
 #include "nsDOMNavigationTiming.h"  // for DOMHighResTimeStamp
 #include "nsIDOMProcessChild.h"
 #include "nsIDOMProcessParent.h"
 
 namespace mozilla {
 
+class ErrorResult;
+
 namespace devtools {
 class HeapSnapshot;
 }  // namespace devtools

dom/base/Crypto.cpp

@@ -4,19 +4,15 @@
  * 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 "Crypto.h"
-#include "jsfriendapi.h"
+#include "js/ScalarType.h"
 #include "js/experimental/TypedData.h"  // JS_GetArrayBufferViewType
 #include "nsCOMPtr.h"
 #include "nsIRandomGenerator.h"
-#include "MainThreadUtils.h"
-#include "nsXULAppAPI.h"
 
-#include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/CryptoBinding.h"
+#include "mozilla/dom/SubtleCrypto.h"
 #include "nsServiceManagerUtils.h"
 
-using mozilla::dom::ContentChild;
-
 namespace mozilla::dom {
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(Crypto)

dom/base/CustomElementRegistry.h

@@ -11,7 +11,6 @@
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/CycleCollectedJSContext.h"  // for MicroTaskRunnable
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/CustomElementRegistryBinding.h"
 #include "mozilla/dom/Document.h"
@@ -23,6 +22,8 @@
 #include "nsContentUtils.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 struct CustomElementData;

dom/base/DOMImplementation.h

@@ -10,7 +10,6 @@
 #include "nsWrapperCache.h"
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIScriptGlobalObject.h"
@@ -19,6 +18,8 @@
 #include "nsString.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 class Document;
 class DocumentType;

dom/base/DOMParser.h

@@ -10,7 +10,6 @@
 #include "nsCOMPtr.h"
 #include "mozilla/dom/Document.h"
 #include "nsWrapperCache.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Span.h"
 #include "mozilla/dom/DOMParserBinding.h"
 #include "mozilla/dom/TypedArray.h"
@@ -18,6 +17,8 @@
 class nsIGlobalObject;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class DOMParser final : public nsISupports, public nsWrapperCache {

dom/base/FormData.h

@@ -8,7 +8,6 @@
 #define mozilla_dom_FormData_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/HTMLFormSubmission.h"
 #include "mozilla/dom/File.h"
@@ -17,6 +16,8 @@
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class HTMLFormElement;

dom/base/IdleDeadline.h

@@ -9,7 +9,6 @@
 
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "nsCOMPtr.h"

dom/base/Location.h

@@ -12,14 +12,13 @@
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/LocationBase.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsIWeakReferenceUtils.h"
-#include "nsPIDOMWindow.h"
 #include "nsString.h"
 #include "nsWrapperCache.h"
 
 class nsIDocShell;
+class nsIPrincipal;
 class nsIURI;
-class nsDocShellLoadState;
+class nsPIDOMWindowInner;
 
 namespace mozilla {
 namespace dom {

dom/base/LocationBase.h

@@ -8,7 +8,6 @@
 #define mozilla_dom_LocationBase_h
 
 #include "mozilla/AlreadyAddRefed.h"
-#include "mozilla/ErrorResult.h"
 #include "nsStringFwd.h"
 
 class nsIDocShell;
@@ -17,6 +16,8 @@ class nsIURI;
 class nsDocShellLoadState;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 class BrowsingContext;
 

dom/base/MozQueryInterface.h

@@ -21,10 +21,11 @@
 
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/NonRefcountedDOMObject.h"
-#include "mozilla/ErrorResult.h"
 #include "nsID.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class MozQueryInterface final : public NonRefcountedDOMObject {

dom/base/Navigator.h

@@ -12,7 +12,6 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/Fetch.h"
 #include "mozilla/dom/Nullable.h"
-#include "mozilla/ErrorResult.h"
 #include "nsWrapperCache.h"
 #include "nsHashKeys.h"
 #include "nsInterfaceHashtable.h"
@@ -28,6 +27,8 @@ class nsIPrincipal;
 class nsIURI;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 class AddonManager;
 class BodyExtractorBase;

dom/base/PlacesEvent.h

@@ -8,10 +8,11 @@
 #define mozilla_dom_PlacesEvent_h
 
 #include "mozilla/dom/PlacesEventBinding.h"
-#include "mozilla/ErrorResult.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class PlacesEvent : public nsWrapperCache {

dom/base/PlacesObservers.h

@@ -11,11 +11,11 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/PlacesObserversBinding.h"
 #include "mozilla/dom/PlacesEvent.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/places/INativePlacesEventCallback.h"
 #include "nsIWeakReferenceUtils.h"
 
 namespace mozilla {
+class ErrorResult;
 
 namespace dom {
 

dom/base/PlacesWeakCallbackWrapper.h

@@ -9,7 +9,6 @@
 
 #include "mozilla/WeakPtr.h"
 #include "mozilla/dom/PlacesObserversBinding.h"
-#include "mozilla/ErrorResult.h"
 #include "nsIWeakReferenceUtils.h"
 #include "nsWrapperCache.h"
 

dom/base/PopupBlocker.h

@@ -7,12 +7,17 @@
 #ifndef mozilla_dom_PopupBlocker_h
 #define mozilla_dom_PopupBlocker_h
 
-#include "mozilla/BasicEvents.h"
+#include <stdint.h>
+#include "mozilla/Attributes.h"
+#include "mozilla/TimeStamp.h"
 
+class AutoPopupStatePusherInternal;
 class nsIPrincipal;
 
 namespace mozilla {
+class WidgetEvent;
 namespace dom {
+class Event;
 
 class PopupBlocker final {
  public:

dom/base/Pose.h

@@ -7,10 +7,11 @@
 #ifndef mozilla_dom_Pose_h
 #define mozilla_dom_Pose_h
 
-#include "mozilla/ErrorResult.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class Pose : public nsWrapperCache {

dom/base/ResizeObserver.h

@@ -10,7 +10,6 @@
 #include "js/TypeDecls.h"
 #include "mozilla/AppUnits.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/LinkedList.h"
 #include "mozilla/WritingModes.h"
 #include "mozilla/dom/DOMRect.h"
@@ -26,6 +25,8 @@
 #include "nsPIDOMWindow.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class Element;

dom/base/StaticRange.h

@@ -7,7 +7,6 @@
 #ifndef mozilla_dom_StaticRange_h
 #define mozilla_dom_StaticRange_h
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/RangeBoundary.h"
 #include "mozilla/dom/AbstractRange.h"
 #include "mozilla/dom/StaticRangeBinding.h"
@@ -15,6 +14,8 @@
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class StaticRange final : public AbstractRange {

dom/base/StructuredCloneBlob.h

@@ -7,19 +7,25 @@
 #ifndef mozilla_dom_StructuredCloneBlob_h
 #define mozilla_dom_StructuredCloneBlob_h
 
-#include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/dom/StructuredCloneHolder.h"
-#include "mozilla/dom/StructuredCloneHolderBinding.h"
-
-#include "jsapi.h"
-
+#include "js/TypeDecls.h"
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Maybe.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/dom/StructuredCloneHolder.h"
 #include "nsIMemoryReporter.h"
 #include "nsISupports.h"
 
+struct JSStructuredCloneReader;
+struct JSStructuredCloneWriter;
+
 namespace mozilla {
+
+class ErrorResult;
+
 namespace dom {
 
+class GlobalObject;
+
 class StructuredCloneBlob final : public nsIMemoryReporter {
   MOZ_DEFINE_MALLOC_SIZE_OF(MallocSizeOf)
 

dom/base/Text.h

@@ -8,9 +8,10 @@
 #define mozilla_dom_Text_h
 
 #include "mozilla/dom/CharacterData.h"
-#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class Text : public CharacterData {

dom/base/nsDOMAttributeMap.h

@@ -12,7 +12,6 @@
 #define nsDOMAttributeMap_h
 
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsRefPtrHashtable.h"
 #include "nsString.h"
@@ -22,6 +21,8 @@ class nsAtom;
 class nsINode;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 class Attr;
 class DocGroup;

dom/base/nsDOMSerializer.h

@@ -8,12 +8,15 @@
 #define nsDOMSerializer_h_
 
 #include "mozilla/dom/NonRefcountedDOMObject.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/XMLSerializerBinding.h"
 
 class nsINode;
 class nsIOutputStream;
 
+namespace mozilla {
+class ErrorResult;
+}
+
 class nsDOMSerializer final : public mozilla::dom::NonRefcountedDOMObject {
  public:
   nsDOMSerializer();

dom/base/nsFocusManager.h

@@ -12,7 +12,6 @@
 #include "mozilla/dom/Document.h"
 #include "nsIFocusManager.h"
 #include "nsIObserver.h"
-#include "nsIWidget.h"
 #include "nsWeakReference.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/RefPtr.h"

dom/base/nsGlobalWindowInner.cpp

@@ -4,169 +4,304 @@
  * 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 "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 
-#include <algorithm>
-
-#include "mozilla/MemoryReporting.h"
-
-// Local Includes
+#include <inttypes.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <cstdint>
+#include <new>
+#include <type_traits>
+#include <utility>
+#include "AudioChannelService.h"
 #include "AutoplayPolicy.h"
+#include "Crypto.h"
+#include "GeckoProfiler.h"
+#include "MainThreadUtils.h"
 #include "Navigator.h"
-#include "nsContentSecurityManager.h"
-#include "nsScreen.h"
-#include "nsHistory.h"
-#include "nsDOMNavigationTiming.h"
-#include "nsIDOMStorageManager.h"
+#include "PaintWorkletImpl.h"
+#include "SessionStorageCache.h"
+#include "Units.h"
+#include "VRManagerChild.h"
+#include "WindowDestroyedEvent.h"
+#include "WindowNamedPropertiesHandler.h"
+#include "js/ComparisonOperators.h"
+#include "js/CompileOptions.h"
+#include "js/Id.h"
+#include "js/PropertyDescriptor.h"
+#include "js/RealmOptions.h"
+#include "js/RootingAPI.h"
+#include "js/TypeDecls.h"
+#include "js/Value.h"
+#include "js/Warnings.h"
+#include "js/shadow/String.h"
+#include "jsapi.h"
+#include "jsfriendapi.h"
+#include "mozIDOMWindow.h"
+#include "moz_external_vr.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/ArrayIterator.h"
+#include "mozilla/ArrayUtils.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/BaseProfilerMarkersPrerequisites.h"
+#include "mozilla/BasicEvents.h"
+#include "mozilla/CallState.h"
+#include "mozilla/CycleCollectedJSContext.h"
+#include "mozilla/DOMEventTargetHelper.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/EventDispatcher.h"
+#include "mozilla/EventListenerManager.h"
+#include "mozilla/EventQueue.h"
+#include "mozilla/FloatingPoint.h"
+#include "mozilla/FlushType.h"
+#include "mozilla/Likely.h"
+#include "mozilla/LinkedList.h"
+#include "mozilla/Logging.h"
+#include "mozilla/MacroForEach.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/OwningNonNull.h"
+#include "mozilla/PermissionDelegateHandler.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/PresShell.h"
+#include "mozilla/ProcessHangMonitor.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/Result.h"
+#include "mozilla/ScopeExit.h"
+#include "mozilla/ScrollOrigin.h"
+#include "mozilla/ScrollTypes.h"
+#include "mozilla/Services.h"
+#include "mozilla/SizeOfState.h"
+#include "mozilla/Span.h"
+#include "mozilla/SpinEventLoopUntil.h"
+#include "mozilla/Sprintf.h"
+#include "mozilla/StaticPrefs_browser.h"
+#include "mozilla/StaticPrefs_dom.h"
+#include "mozilla/StorageAccess.h"
+#include "mozilla/TaskCategory.h"
+#include "mozilla/Telemetry.h"
+#include "mozilla/TelemetryHistogramEnums.h"
+#include "mozilla/TimeStamp.h"
+#include "mozilla/UniquePtr.h"
+#include "mozilla/Unused.h"
+#include "mozilla/dom/AudioContext.h"
+#include "mozilla/dom/BarProps.h"
+#include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/BindingUtils.h"
+#include "mozilla/dom/BrowserChild.h"
+#include "mozilla/dom/BrowsingContext.h"
+#include "mozilla/dom/CSPEvalChecker.h"
 #include "mozilla/dom/CallbackDebuggerNotification.h"
-#include "mozilla/dom/ContentChild.h"
+#include "mozilla/dom/ChromeMessageBroadcaster.h"
+#include "mozilla/dom/ClientInfo.h"
+#include "mozilla/dom/ClientManager.h"
+#include "mozilla/dom/ClientSource.h"
+#include "mozilla/dom/ClientState.h"
+#include "mozilla/dom/ClientsBinding.h"
+#include "mozilla/dom/Console.h"
 #include "mozilla/dom/ContentFrameMessageManager.h"
 #include "mozilla/dom/ContentMediaController.h"
-#include "mozilla/dom/ContentParent.h"
-#include "mozilla/dom/CSPEvalChecker.h"
 #include "mozilla/dom/CustomElementRegistry.h"
-#include "mozilla/dom/DebuggerNotification.h"
-#include "mozilla/dom/DocumentInlines.h"
 #include "mozilla/dom/DOMJSProxyHandler.h"
+#include "mozilla/dom/DebuggerNotification.h"
+#include "mozilla/dom/DebuggerNotificationBinding.h"
+#include "mozilla/dom/DebuggerNotificationManager.h"
+#include "mozilla/dom/DispatcherTrait.h"
+#include "mozilla/dom/DocGroup.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/DocumentInlines.h"
+#include "mozilla/dom/Element.h"
+#include "mozilla/dom/Event.h"
 #include "mozilla/dom/EventTarget.h"
+#include "mozilla/dom/Fetch.h"
+#include "mozilla/dom/Gamepad.h"
+#include "mozilla/dom/GamepadManager.h"
+#include "mozilla/dom/HashChangeEvent.h"
+#include "mozilla/dom/HashChangeEventBinding.h"
+#include "mozilla/dom/IDBFactory.h"
+#include "mozilla/dom/IdleRequest.h"
+#include "mozilla/dom/ImageBitmap.h"
+#include "mozilla/dom/ImageBitmapSource.h"
+#include "mozilla/dom/InstallTriggerBinding.h"
+#include "mozilla/dom/IntlUtils.h"
+#include "mozilla/dom/LSObject.h"
+#include "mozilla/dom/LoadedScript.h"
 #include "mozilla/dom/LocalStorage.h"
 #include "mozilla/dom/LocalStorageCommon.h"
-#include "mozilla/dom/LSObject.h"
+#include "mozilla/dom/Location.h"
+#include "mozilla/dom/NavigatorBinding.h"
+#include "mozilla/dom/Nullable.h"
 #include "mozilla/dom/PartitionedLocalStorage.h"
-#include "mozilla/dom/Storage.h"
-#include "mozilla/dom/IdleRequest.h"
 #include "mozilla/dom/Performance.h"
+#include "mozilla/dom/PopStateEvent.h"
+#include "mozilla/dom/PopStateEventBinding.h"
+#include "mozilla/dom/PopupBlocker.h"
+#include "mozilla/dom/PrimitiveConversions.h"
+#include "mozilla/dom/Promise.h"
+#include "mozilla/dom/RootedDictionary.h"
 #include "mozilla/dom/ScriptLoader.h"
+#include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/dom/ServiceWorker.h"
+#include "mozilla/dom/ServiceWorkerDescriptor.h"
+#include "mozilla/dom/ServiceWorkerRegistration.h"
 #include "mozilla/dom/SessionStorageManager.h"
+#include "mozilla/dom/SharedWorker.h"
+#include "mozilla/dom/Storage.h"
 #include "mozilla/dom/StorageEvent.h"
 #include "mozilla/dom/StorageEventBinding.h"
 #include "mozilla/dom/StorageNotifierService.h"
 #include "mozilla/dom/StorageUtils.h"
+#include "mozilla/dom/TabMessageTypes.h"
 #include "mozilla/dom/Timeout.h"
 #include "mozilla/dom/TimeoutHandler.h"
 #include "mozilla/dom/TimeoutManager.h"
+#include "mozilla/dom/ToJSValue.h"
+#include "mozilla/dom/U2F.h"
+#include "mozilla/dom/VRDisplay.h"
+#include "mozilla/dom/VRDisplayEvent.h"
+#include "mozilla/dom/VRDisplayEventBinding.h"
+#include "mozilla/dom/VREventObserver.h"
 #include "mozilla/dom/VisualViewport.h"
-#include "mozilla/dom/WindowProxyHolder.h"
-#ifdef MOZ_GLEAN
-#  include "mozilla/glean/Glean.h"
-#endif
-#include "mozilla/IntegerPrintfMacros.h"
-#include "mozilla/Result.h"
-#if defined(MOZ_WIDGET_ANDROID)
-#  include "mozilla/dom/WindowOrientationObserver.h"
-#endif
-#include "nsDOMOfflineResourceList.h"
-#include "nsICookieService.h"
-#include "nsError.h"
-#include "nsISizeOfEventTarget.h"
-#include "nsDOMJSUtils.h"
-#include "nsArrayUtils.h"
 #include "mozilla/dom/WakeLock.h"
-#include "mozilla/dom/power/PowerManagerService.h"
+#include "mozilla/dom/WebIDLGlobalNameHash.h"
+#include "mozilla/dom/WindowBinding.h"
+#include "mozilla/dom/WindowContext.h"
+#include "mozilla/dom/WindowGlobalChild.h"
+#include "mozilla/dom/WindowProxyHolder.h"
+#include "mozilla/dom/WorkerCommon.h"
+#include "mozilla/dom/Worklet.h"
+#include "mozilla/dom/XRPermissionRequest.h"
+#include "mozilla/dom/cache/CacheStorage.h"
+#include "mozilla/dom/cache/Types.h"
+#include "mozilla/fallible.h"
+#include "mozilla/gfx/BasePoint.h"
+#include "mozilla/gfx/BaseRect.h"
+#include "mozilla/gfx/BaseSize.h"
+#include "mozilla/gfx/Rect.h"
+#include "mozilla/gfx/Types.h"
+#include "mozilla/intl/LocaleService.h"
+#include "mozilla/net/CookieJarSettings.h"
+#include "nsAtom.h"
+#include "nsBaseHashtable.h"
+#include "nsCCUncollectableMarker.h"
+#include "nsCOMPtr.h"
+#include "nsCRT.h"
+#include "nsCRTGlue.h"
+#include "nsCanvasFrame.h"
+#include "nsCharTraits.h"
+#include "nsCheapSets.h"
+#include "nsContentUtils.h"
+#include "nsCoord.h"
+#include "nsCycleCollectionNoteChild.h"
+#include "nsCycleCollectionTraversalCallback.h"
+#include "nsDOMNavigationTiming.h"
+#include "nsDOMOfflineResourceList.h"
+#include "nsDebug.h"
+#include "nsDocShell.h"
+#include "nsFocusManager.h"
+#include "nsFrameMessageManager.h"
+#include "nsGkAtoms.h"
+#include "nsGlobalWindowOuter.h"
+#include "nsHashKeys.h"
+#include "nsHistory.h"
+#include "nsIAddonPolicyService.h"
+#include "nsIArray.h"
+#include "nsIBaseWindow.h"
+#include "nsIBrowserChild.h"
+#include "nsICancelableRunnable.h"
+#include "nsIChannel.h"
 #include "nsIContentSecurityPolicy.h"
+#include "nsIControllers.h"
+#include "nsICookieJarSettings.h"
+#include "nsICookieService.h"
+#include "nsID.h"
+#include "nsIDOMStorageManager.h"
+#include "nsIDeviceSensors.h"
+#include "nsIDocShell.h"
+#include "nsIDocShellTreeItem.h"
 #include "nsIDocShellTreeOwner.h"
 #include "nsIDocumentLoader.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsIScriptContext.h"
-#include "nsIController.h"
-#include "nsISlowScriptDebug.h"
-#include "nsWindowMemoryReporter.h"
-#include "nsWindowSizes.h"
-#include "WindowNamedPropertiesHandler.h"
-#include "nsFrameSelection.h"
-#include "nsNetUtil.h"
-#include "nsVariant.h"
-#include "nsPrintfCString.h"
-#include "mozilla/intl/LocaleService.h"
-#include "WindowDestroyedEvent.h"
-
-// Helper Classes
-#include "nsJSUtils.h"
-#include "jsapi.h"
-#include "jsfriendapi.h"
-#include "js/Warnings.h"  // JS::WarnASCII
-#include "js/Wrapper.h"
-#include "nsCharSeparatedTokenizer.h"
-#include "nsReadableUtils.h"
-#include "nsJSEnvironment.h"
-#include "mozilla/dom/ScriptSettings.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/Likely.h"
-#include "mozilla/SpinEventLoopUntil.h"
-#include "mozilla/Sprintf.h"
-#include "mozilla/StorageAccess.h"
-#include "mozilla/Unused.h"
-
-// Other Classes
-#include "mozilla/dom/BarProps.h"
-#include "nsContentCID.h"
-#include "nsLayoutStatics.h"
-#include "nsCCUncollectableMarker.h"
-#include "mozilla/dom/WorkerCommon.h"
-#include "mozilla/dom/ToJSValue.h"
-#include "nsJSPrincipals.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/Debug.h"
-#include "mozilla/EventListenerManager.h"
-#include "mozilla/EventStates.h"
-#include "mozilla/MouseEvents.h"
-#include "mozilla/PresShell.h"
-#include "mozilla/ProcessHangMonitor.h"
-#include "mozilla/ScrollTypes.h"
-#include "mozilla/ThrottledEventQueue.h"
-#include "AudioChannelService.h"
-#include "nsAboutProtocolUtils.h"
-#include "nsCharTraits.h"  // NS_IS_HIGH/LOW_SURROGATE
-#include "PostMessageEvent.h"
-#include "mozilla/dom/DocGroup.h"
-#include "mozilla/StaticPrefs_browser.h"
-#include "mozilla/StaticPrefs_dom.h"
-#include "PaintWorkletImpl.h"
-
-// Interfaces Needed
+#include "nsIDragService.h"
+#include "nsIFocusManager.h"
 #include "nsIFrame.h"
-#include "nsCanvasFrame.h"
+#include "nsIGlobalObject.h"
+#include "nsIIOService.h"
+#include "nsIIdleRunnable.h"
+#include "nsIInterfaceRequestorUtils.h"
+#include "nsILoadContext.h"
+#include "nsILoadGroup.h"
+#include "nsILoadInfo.h"
+#include "nsINamed.h"
+#include "nsINode.h"
+#include "nsIObserver.h"
+#include "nsIObserverService.h"
+#include "nsIPermission.h"
+#include "nsIPermissionManager.h"
+#include "nsIPrefBranch.h"
+#include "nsIPrincipal.h"
+#include "nsIPrompt.h"
+#include "nsIRunnable.h"
+#include "nsIScreen.h"
+#include "nsIScreenManager.h"
+#include "nsIScriptContext.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIScriptObjectPrincipal.h"
+#include "nsIScrollableFrame.h"
+#include "nsISerialEventTarget.h"
+#include "nsISimpleEnumerator.h"
+#include "nsISizeOfEventTarget.h"
+#include "nsISlowScriptDebug.h"
+#include "nsISupportsUtils.h"
+#include "nsIThread.h"
+#include "nsITimedChannel.h"
+#include "nsIURI.h"
+#include "nsIVariant.h"
+#include "nsIWeakReference.h"
+#include "nsIWebBrowserChrome.h"
+#include "nsIWebNavigation.h"
+#include "nsIWebProgressListener.h"
 #include "nsIWidget.h"
 #include "nsIWidgetListener.h"
-#include "nsIBaseWindow.h"
-#include "nsIDeviceSensors.h"
-#include "nsIContent.h"
-#include "nsIDocShell.h"
-#include "mozilla/dom/Document.h"
-#include "Crypto.h"
-#include "nsDOMString.h"
-#include "nsThreadUtils.h"
-#include "nsILoadContext.h"
-#include "nsIScrollableFrame.h"
-#include "nsView.h"
-#include "nsViewManager.h"
-#include "nsIPrompt.h"
-#include "nsIAddonPolicyService.h"
-#include "nsIWebNavigation.h"
-#include "nsIWebBrowserChrome.h"
-#include "nsDOMCID.h"
-#include "nsDOMWindowUtils.h"
-#include "nsIControllers.h"
-#include "nsGlobalWindowCommands.h"
+#include "nsJSPrincipals.h"
+#include "nsJSUtils.h"
+#include "nsLayoutStatics.h"
+#include "nsLiteralString.h"
+#include "nsNetUtil.h"
+#include "nsPIDOMWindow.h"
+#include "nsPIDOMWindowInlines.h"
+#include "nsPIWindowRoot.h"
+#include "nsPoint.h"
+#include "nsPresContext.h"
 #include "nsQueryObject.h"
-#include "nsContentUtils.h"
-#include "nsCSSProps.h"
-#include "mozilla/EventDispatcher.h"
-#include "mozilla/EventStateManager.h"
-#include "nsIObserverService.h"
-#include "nsFocusManager.h"
-#include "nsITimedChannel.h"
+#include "nsRefPtrHashtable.h"
+#include "nsSandboxFlags.h"
+#include "nsScreen.h"
 #include "nsServiceManagerUtils.h"
+#include "nsString.h"
+#include "nsStringFlags.h"
+#include "nsStringFwd.h"
+#include "nsTArray.h"
+#include "nsTLiteralString.h"
+#include "nsTObserverArray.h"
+#include "nsTStringRepr.h"
+#include "nsThreadUtils.h"
+#include "nsWeakReference.h"
+#include "nsWindowMemoryReporter.h"
+#include "nsWindowSizes.h"
+#include "nsWrapperCache.h"
+#include "nsWrapperCacheInlines.h"
+#include "nsXULAppAPI.h"
+#include "nsrootidl.h"
+#include "prclist.h"
+#include "prtypes.h"
+#include "xpcprivate.h"
+#include "xpcpublic.h"
+
 #ifdef MOZ_XUL
 #  include "nsIDOMXULControlElement.h"
 #  include "nsMenuPopupFrame.h"
 #endif
-#include "mozilla/dom/CustomEvent.h"
-#include "nsIScreenManager.h"
-#include "nsICSSDeclaration.h"
-#include "nsIPermission.h"
-
-#include "xpcprivate.h"
 
 #ifdef NS_PRINTING
 #  include "nsIPrintSettings.h"
@@ -174,72 +309,6 @@
 #  include "nsIWebBrowserPrint.h"
 #endif
 
-#include "nsWindowRoot.h"
-#include "nsNetCID.h"
-#include "nsIArray.h"
-
-#include "nsIDragService.h"
-#include "mozilla/dom/Element.h"
-#include "mozilla/dom/Selection.h"
-#include "nsFrameLoader.h"
-#include "nsXPCOMCID.h"
-#include "mozilla/Logging.h"
-#include "prenv.h"
-
-#include "mozilla/dom/IDBFactory.h"
-#include "mozilla/dom/MessageChannel.h"
-#include "mozilla/dom/Promise.h"
-
-#include "mozilla/dom/Gamepad.h"
-#include "mozilla/dom/GamepadManager.h"
-
-#include "gfxVR.h"
-#include "mozilla/dom/VRDisplay.h"
-#include "mozilla/dom/VRDisplayEvent.h"
-#include "mozilla/dom/VRDisplayEventBinding.h"
-#include "mozilla/dom/VREventObserver.h"
-#include "mozilla/dom/XRPermissionRequest.h"
-
-#include "nsRefreshDriver.h"
-#include "Layers.h"
-
-#include "mozilla/BasePrincipal.h"
-#include "mozilla/Services.h"
-#include "mozilla/Telemetry.h"
-#include "mozilla/dom/Location.h"
-#include "nsHTMLDocument.h"
-#include "nsWrapperCacheInlines.h"
-#include "mozilla/DOMEventTargetHelper.h"
-#include "prrng.h"
-#include "nsSandboxFlags.h"
-#include "mozilla/dom/AudioContext.h"
-#include "mozilla/dom/BrowserElementDictionariesBinding.h"
-#include "mozilla/dom/cache/CacheStorage.h"
-#include "mozilla/dom/Console.h"
-#include "mozilla/dom/Fetch.h"
-#include "mozilla/dom/FunctionBinding.h"
-#include "mozilla/dom/HashChangeEvent.h"
-#include "mozilla/dom/IntlUtils.h"
-#include "mozilla/dom/PopStateEvent.h"
-#include "mozilla/dom/PopupBlocker.h"
-#include "mozilla/dom/PopupBlockedEvent.h"
-#include "mozilla/dom/PrimitiveConversions.h"
-#include "mozilla/dom/WindowBinding.h"
-#include "nsIBrowserChild.h"
-#include "mozilla/dom/LoadedScript.h"
-#include "mozilla/dom/MediaQueryList.h"
-#include "mozilla/dom/ScriptSettings.h"
-#include "mozilla/dom/NavigatorBinding.h"
-#include "mozilla/dom/ImageBitmap.h"
-#include "mozilla/dom/ImageBitmapBinding.h"
-#include "mozilla/dom/InstallTriggerBinding.h"
-#include "mozilla/dom/SharedWorker.h"
-#include "mozilla/dom/ServiceWorker.h"
-#include "mozilla/dom/ServiceWorkerRegistration.h"
-#include "mozilla/dom/ServiceWorkerRegistrationDescriptor.h"
-#include "mozilla/dom/U2F.h"
-#include "mozilla/dom/WebIDLGlobalNameHash.h"
-#include "mozilla/dom/Worklet.h"
 #ifdef HAVE_SIDEBAR
 #  include "mozilla/dom/ExternalBinding.h"
 #endif
@@ -248,23 +317,16 @@
 #  include "mozilla/dom/SpeechSynthesis.h"
 #endif
 
-#include "mozilla/dom/ClientManager.h"
-#include "mozilla/dom/ClientSource.h"
-#include "mozilla/dom/ClientState.h"
-
-#include "mozilla/dom/WindowGlobalChild.h"
-#include "mozilla/dom/BrowserChild.h"
-
-#include "mozilla/net/CookieJarSettings.h"
-
-#include "AccessCheck.h"
-#include "SessionStorageCache.h"
-
 #ifdef ANDROID
 #  include <android/log.h>
 #endif
 
+#ifdef MOZ_WIDGET_ANDROID
+#  include "mozilla/dom/WindowOrientationObserver.h"
+#endif
+
 #ifdef XP_WIN
+#  include "mozilla/Debug.h"
 #  include <process.h>
 #  define getpid _getpid
 #else

dom/base/nsGlobalWindowInner.h

@@ -41,7 +41,6 @@
 #include "mozilla/dom/StorageEventBinding.h"
 #include "mozilla/dom/UnionTypes.h"
 #include "mozilla/CallState.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/LinkedList.h"
 #include "mozilla/OwningNonNull.h"
@@ -98,6 +97,8 @@ class PromiseDocumentFlushedResolver;
 
 namespace mozilla {
 class AbstractThread;
+class ErrorResult;
+
 namespace dom {
 class BarProp;
 class BrowsingContext;

dom/base/nsGlobalWindowOuter.h

@@ -39,7 +39,6 @@
 #include "mozilla/dom/StorageEvent.h"
 #include "mozilla/dom/StorageEventBinding.h"
 #include "mozilla/dom/UnionTypes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/LinkedList.h"
 #include "nsWrapperCacheInlines.h"
@@ -84,6 +83,7 @@ class nsWindowSizes;
 namespace mozilla {
 class AbstractThread;
 class DOMEventTargetHelper;
+class ErrorResult;
 class ThrottledEventQueue;
 namespace dom {
 class BarProp;

dom/base/nsHistory.h

@@ -7,7 +7,6 @@
 #define nsHistory_h___
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/HistoryBinding.h"
 #include "mozilla/dom/ChildSHistory.h"
 #include "nsCOMPtr.h"
@@ -22,6 +21,10 @@ class nsISHistory;
 class nsIWeakReference;
 class nsPIDOMWindowInner;
 
+namespace mozilla {
+class ErrorResult;
+}
+
 // Script "History" object
 class nsHistory final : public nsISupports, public nsWrapperCache {
  public:

dom/base/nsIDocumentObserver.h

@@ -6,13 +6,13 @@
 #ifndef nsIDocumentObserver_h___
 #define nsIDocumentObserver_h___
 
-#include "mozilla/EventStates.h"
-#include "mozilla/StyleSheet.h"
 #include "nsISupports.h"
 #include "nsIMutationObserver.h"
 
 class nsIContent;
 namespace mozilla {
+class EventStates;
+
 namespace dom {
 class Document;
 }

dom/base/nsImageLoadingContent.h

@@ -21,7 +21,6 @@
 #include "nsIContentPolicy.h"
 #include "nsIImageLoadingContent.h"
 #include "nsIRequest.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/Promise.h"
 #include "nsAttrValue.h"
@@ -35,6 +34,8 @@ class imgRequestProxy;
 
 namespace mozilla {
 class AsyncEventDispatcher;
+class ErrorResult;
+
 namespace dom {
 struct BindContext;
 class Document;

dom/base/nsJSUtils.h

@@ -15,8 +15,6 @@
  */
 
 #include "mozilla/Assertions.h"
-#include "mozilla/StaticPrefs_dom.h"
-#include "mozilla/Utf8.h"  // mozilla::Utf8Unit
 
 #include "GeckoProfiler.h"
 #include "jsapi.h"
@@ -34,6 +32,8 @@ class nsIScriptGlobalObject;
 class nsXBLPrototypeBinding;
 
 namespace mozilla {
+union Utf8Unit;
+
 namespace dom {
 class AutoJSAPI;
 class Element;

dom/base/nsTraversal.h

@@ -13,11 +13,14 @@
 
 #include "nsCOMPtr.h"
 #include "mozilla/dom/CallbackObject.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/NodeFilterBinding.h"
 
 class nsINode;
 
+namespace mozilla {
+class ErrorResult;
+}
+
 class nsTraversal {
  public:
   nsTraversal(nsINode* aRoot, uint32_t aWhatToShow,

dom/base/nsWrapperCache.h

@@ -10,8 +10,6 @@
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/Assertions.h"
 #include "js/HeapAPI.h"
-#include "js/Id.h"     // must come before js/RootingAPI.h
-#include "js/Value.h"  // must come before js/RootingAPI.h
 #include "js/RootingAPI.h"
 #include "js/TracingAPI.h"
 #include "jsfriendapi.h"

dom/bindings/CallbackObject.h

@@ -17,28 +17,47 @@
 #ifndef mozilla_dom_CallbackObject_h
 #define mozilla_dom_CallbackObject_h
 
-#include "nsISupports.h"
-#include "nsISupportsImpl.h"
-#include "nsCycleCollectionParticipant.h"
+#include <cstddef>
+#include <cstdint>
+#include <utility>
+#include "js/RootingAPI.h"
 #include "js/Wrapper.h"
-#include "mozilla/Assertions.h"
-#include "mozilla/ErrorResult.h"
-#include "mozilla/HoldDropJSObjects.h"
-#include "mozilla/MemoryReporting.h"
-#include "mozilla/OwningNonNull.h"
-#include "mozilla/dom/ScriptSettings.h"
-#include "mozilla/dom/BindingCallContext.h"
-#include "nsWrapperCache.h"
-#include "nsJSEnvironment.h"
-#include "xpcpublic.h"
 #include "jsapi.h"
-#include "js/ContextOptions.h"
-#include "js/Object.h"  // JS::GetCompartment
-#include "js/TracingAPI.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/HoldDropJSObjects.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/dom/BindingCallContext.h"
+#include "mozilla/dom/ScriptSettings.h"
+#include "nsCOMPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsID.h"
+#include "nsIGlobalObject.h"
+#include "nsISupports.h"
+#include "nsISupportsUtils.h"
+#include "nsStringFwd.h"
+
+class JSAutoRealm;
+class JSObject;
+class JSTracer;
+class nsCycleCollectionTraversalCallback;
+struct JSContext;
+
+namespace JS {
+class AutoSetAsyncStackForNewCalls;
+class Realm;
+class Value;
+}  // namespace JS
 
 namespace mozilla {
 
+class ErrorResult;
 class PromiseJobRunnable;
+template <class T>
+class OwningNonNull;
 
 namespace dom {
 

dom/bindings/IterableIterator.h

@@ -27,14 +27,12 @@
 #ifndef mozilla_dom_IterableIterator_h
 #define mozilla_dom_IterableIterator_h
 
+#include "js/TypeDecls.h"
+#include "js/Value.h"
 #include "nsISupports.h"
-#include "nsWrapperCache.h"
-#include "nsPIDOMWindow.h"
-#include "nsCOMPtr.h"
+#include "mozilla/dom/IterableIteratorBinding.h"
 #include "mozilla/dom/RootedDictionary.h"
 #include "mozilla/dom/ToJSValue.h"
-#include "js/Wrapper.h"
-#include "mozilla/dom/IterableIteratorBinding.h"
 
 namespace mozilla {
 namespace dom {

dom/bindings/PrimitiveConversions.h

@@ -18,7 +18,6 @@
 #include "jsapi.h"
 #include "js/Conversions.h"
 #include "mozilla/Assertions.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/dom/BindingCallContext.h"
 

dom/bindings/ToJSValue.h

@@ -7,24 +7,37 @@
 #ifndef mozilla_dom_ToJSValue_h
 #define mozilla_dom_ToJSValue_h
 
-#include "mozilla/Assertions.h"
-#include "mozilla/UniquePtr.h"
-#include "mozilla/dom/BindingUtils.h"
-#include "mozilla/dom/CallbackObject.h"
-#include "mozilla/dom/NonRefcountedDOMObject.h"
-#include "mozilla/dom/TypedArray.h"
-#include "jsapi.h"
-#include "js/Array.h"  // JS::NewArrayObject
-#include "nsISupports.h"
-#include "nsTArray.h"
-#include "nsWrapperCache.h"
-#include <type_traits>
+#include <cstddef>  // for size_t
+#include <cstdint>  // for int32_t, int64_t, uint32_t, uint64_t
+#include <type_traits>  // for is_base_of, enable_if_t, enable_if, is_pointer, is_same, void_t
+#include <utility>          // for forward
+#include "ErrorList.h"      // for nsresult
+#include "js/Array.h"       // for NewArrayObject
+#include "js/GCVector.h"    // for RootedVector, MutableWrappedPtrOperations
+#include "js/RootingAPI.h"  // for MutableHandle, Rooted, Handle, Heap
+#include "js/Value.h"       // for Value
+#include "js/ValueArray.h"  // for HandleValueArray
+#include "jsapi.h"          // for CurrentGlobalOrNull
+#include "mozilla/Assertions.h"  // for AssertionConditionType, MOZ_ASSERT, MOZ_ASSERT_HELPER1
+#include "mozilla/Attributes.h"        // for MOZ_MUST_USE
+#include "mozilla/UniquePtr.h"         // for UniquePtr
+#include "mozilla/Unused.h"            // for Unused
+#include "mozilla/dom/BindingUtils.h"  // for MaybeWrapValue, MaybeWrapObjectOrNullValue, XPCOMObjectToJsval, GetOrCreateDOMReflector
+#include "mozilla/dom/CallbackObject.h"  // for CallbackObject
+#include "nsID.h"                        // for NS_GET_TEMPLATE_IID, nsIID
+#include "nsISupports.h"                 // for nsISupports
+#include "nsStringFwd.h"                 // for nsAString
+#include "nsTArrayForwardDeclare.h"
+#include "xpcObjectHelper.h"  // for xpcObjectHelper
 
 namespace mozilla {
 namespace dom {
 
+class CallbackObject;
 class Promise;
 class WindowProxyHolder;
+template <typename TypedArrayType>
+class TypedArrayCreator;
 
 // If ToJSValue returns false, it must set an exception on the
 // JSContext.

dom/bindings/test/WrapperCachedNonISupportsTestInterface.h

@@ -9,7 +9,6 @@
 
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"

dom/cache/ReadStream.h

@@ -7,7 +7,6 @@
 #ifndef mozilla_dom_cache_ReadStream_h
 #define mozilla_dom_cache_ReadStream_h
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/SafeRefPtr.h"
 #include "mozilla/ipc/FileDescriptor.h"
 #include "mozilla/RefPtr.h"
@@ -18,6 +17,8 @@
 #include "nsTArrayForwardDeclare.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace ipc {
 class AutoIPCStream;
 }  // namespace ipc

dom/canvas/CanvasPath.h

@@ -10,9 +10,10 @@
 #include "nsWrapperCache.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 enum class CanvasWindingRule : uint8_t;

dom/canvas/CanvasRenderingContext2D.h

@@ -13,7 +13,6 @@
 #include "mozilla/gfx/2D.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/EnumeratedArray.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/SurfaceFromElementResult.h"
 #include "mozilla/UniquePtr.h"
@@ -28,6 +27,7 @@ class nsGlobalWindowInner;
 class nsXULElement;
 
 namespace mozilla {
+class ErrorResult;
 class PresShell;
 
 namespace gl {

dom/canvas/WebGLContext.h

@@ -20,7 +20,6 @@
 #include "mozilla/dom/Nullable.h"
 #include "mozilla/dom/TypedArray.h"
 #include "mozilla/EnumeratedArray.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/UniquePtr.h"

dom/clients/api/ClientDOMUtil.h

@@ -10,7 +10,6 @@
 #include "mozilla/dom/ClientOpPromise.h"
 #include "mozilla/dom/DOMMozPromiseRequestHolder.h"
 #include "mozilla/dom/WorkerPrivate.h"
-#include "mozilla/ErrorResult.h"
 
 class nsIGlobalObject;
 

dom/clients/manager/ClientHandleParent.h

@@ -7,7 +7,6 @@
 #define _mozilla_dom_ClientHandleParent_h
 
 #include "mozilla/dom/PClientHandleParent.h"
-#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
 namespace dom {

dom/clients/manager/ClientInfo.h

@@ -8,10 +8,14 @@
 #define _mozilla_dom_ClientInfo_h
 
 #include "X11UndefineNone.h"
-#include "mozilla/dom/ClientBinding.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtr.h"
+#include "nsCOMPtr.h"
+#include "nsString.h"
+
+class nsIPrincipal;
+struct nsID;
 
 namespace mozilla {
 
@@ -23,6 +27,8 @@ class PrincipalInfo;
 namespace dom {
 
 class IPCClientInfo;
+enum class FrameType : uint8_t;
+enum class ClientType : uint8_t;
 
 // This class provides a simple structure that represents a global living
 // in the system.  Its thread safe and can be transferred across process

dom/clients/manager/ClientOpPromise.h

@@ -6,10 +6,11 @@
 #ifndef _mozilla_dom_ClientOpPromise_h
 #define _mozilla_dom_ClientOpPromise_h
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/MozPromise.h"
 
 namespace mozilla {
+class CopyableErrorResult;
+
 namespace dom {
 
 class ClientOpResult;

dom/console/Console.h

@@ -7,19 +7,18 @@
 #ifndef mozilla_dom_Console_h
 #define mozilla_dom_Console_h
 
+#include "domstubs.h"
 #include "mozilla/dom/ConsoleBinding.h"
-#include "mozilla/JSObjectHolder.h"
 #include "mozilla/TimeStamp.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsDataHashtable.h"
 #include "nsHashKeys.h"
 #include "nsIObserver.h"
 #include "nsWeakReference.h"
-#include "nsDOMNavigationTiming.h"
-#include "nsPIDOMWindow.h"
 
 class nsIConsoleAPIStorage;
-class nsIPrincipal;
+class nsIGlobalObject;
+class nsPIDOMWindowInner;
 class nsIStackFrame;
 
 namespace mozilla {
@@ -28,7 +27,6 @@ namespace dom {
 class AnyCallback;
 class ConsoleCallData;
 class ConsoleInstance;
-class ConsoleInstanceDumpCallback;
 class ConsoleRunnable;
 class ConsoleCallDataRunnable;
 class ConsoleProfileRunnable;

dom/events/DataTransferItem.h

@@ -7,12 +7,13 @@
 #ifndef mozilla_dom_DataTransferItem_h
 #define mozilla_dom_DataTransferItem_h
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/DataTransfer.h"
 #include "mozilla/dom/DOMString.h"
 #include "mozilla/dom/File.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class FileSystemEntry;

dom/events/Event.h

@@ -7,28 +7,33 @@
 #ifndef mozilla_dom_Event_h_
 #define mozilla_dom_Event_h_
 
-#include "mozilla/Attributes.h"
-#include "mozilla/BasicEvents.h"
-#include "nsISupports.h"
-#include "nsCOMPtr.h"
-#include "nsPIDOMWindow.h"
-#include "nsPoint.h"
-#include "nsCycleCollectionParticipant.h"
-#include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/dom/EventBinding.h"
-#include "mozilla/dom/PopupBlocker.h"
-#include "nsIScriptGlobalObject.h"
+#include <cstdint>
 #include "Units.h"
 #include "js/TypeDecls.h"
-#include "nsIGlobalObject.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/BasicEvents.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/dom/BindingDeclarations.h"
+#include "nsCOMPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsID.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"
+#include "nsWrapperCache.h"
 
 // XXX(Bug 1674080) Remove this and let Codegen.py generate it instead when
 // needed.
 #include "mozilla/HoldDropJSObjects.h"
 
-class nsIContent;
-class nsPresContext;
 class PickleIterator;
+class nsCycleCollectionTraversalCallback;
+class nsIContent;
+class nsIGlobalObject;
+class nsIPrincipal;
+class nsPIDOMWindowInner;
+class nsPresContext;
 
 namespace IPC {
 class Message;
@@ -39,6 +44,7 @@ namespace dom {
 
 class BeforeUnloadEvent;
 class CustomEvent;
+class Document;
 class DragEvent;
 class EventTarget;
 class EventMessageAutoOverride;
@@ -51,6 +57,8 @@ class TimeEvent;
 class UIEvent;
 class WantsPopupControlCheck;
 class XULCommandEvent;
+struct EventInit;
+
 #define GENERATED_EVENT(EventClass_) class EventClass_;
 #include "mozilla/dom/GeneratedEventList.h"
 #undef GENERATED_EVENT

dom/events/TextClause.h

@@ -9,7 +9,6 @@
 
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsPIDOMWindow.h"

dom/fetch/Fetch.h

@@ -13,7 +13,6 @@
 #include "nsString.h"
 
 #include "mozilla/DebugOnly.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/AbortSignal.h"
 #include "mozilla/dom/BodyConsumer.h"
 #include "mozilla/dom/BodyStream.h"
@@ -25,6 +24,8 @@ class nsIGlobalObject;
 class nsIEventTarget;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class BlobOrArrayBufferViewOrArrayBufferOrFormDataOrURLSearchParamsOrUSVString;

dom/fetch/FetchUtil.h

@@ -10,7 +10,6 @@
 #include "nsString.h"
 #include "nsError.h"
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/FormData.h"
 

dom/file/BaseBlobImpl.h

@@ -8,6 +8,7 @@
 #define mozilla_dom_BaseBlobImpl_h
 
 #include "mozilla/dom/BlobImpl.h"
+#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
 namespace dom {

dom/file/Blob.h

@@ -8,7 +8,6 @@
 #define mozilla_dom_Blob_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/BodyConsumer.h"
@@ -21,6 +20,8 @@ class nsIGlobalObject;
 class nsIInputStream;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 struct BlobPropertyBag;

dom/file/BlobImpl.h

@@ -8,7 +8,6 @@
 #define mozilla_dom_BlobImpl_h
 
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/ErrorResult.h"
 #include "nsISupportsImpl.h"
 #include "nsString.h"
 
@@ -22,6 +21,8 @@
 class nsIInputStream;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 // This is the abstract class for any File backend. It must be nsISupports

dom/file/FileCreatorHelper.h

@@ -8,7 +8,6 @@
 #define mozilla_dom_FileCreatorHelper_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/RefPtr.h"
 #include "nsISupportsImpl.h"
 
@@ -22,6 +21,8 @@ class nsIFile;
 class nsIGlobalObject;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 struct ChromeFilePropertyBag;

dom/file/MultipartBlobImpl.h

@@ -11,11 +11,12 @@
 
 #include "Blob.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/dom/BaseBlobImpl.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 // This is just a sentinel value to be sure that we don't call

dom/filesystem/Directory.h

@@ -8,13 +8,14 @@
 #define mozilla_dom_Directory_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/File.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class FileSystemBase;

dom/filesystem/FileSystemTaskBase.h

@@ -7,13 +7,14 @@
 #ifndef mozilla_dom_FileSystemTaskBase_h
 #define mozilla_dom_FileSystemTaskBase_h
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/FileSystemRequestParent.h"
 #include "mozilla/dom/PFileSystemRequestChild.h"
 #include "nsIGlobalObject.h"
 #include "nsThreadUtils.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class BlobImpl;

dom/filesystem/GetDirectoryListingTask.h

@@ -9,9 +9,10 @@
 
 #include "mozilla/dom/Directory.h"
 #include "mozilla/dom/FileSystemTaskBase.h"
-#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class BlobImpl;

dom/filesystem/GetFileOrDirectoryTask.h

@@ -9,9 +9,10 @@
 
 #include "mozilla/dom/Directory.h"
 #include "mozilla/dom/FileSystemTaskBase.h"
-#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class BlobImpl;

dom/filesystem/GetFilesTask.h

@@ -10,9 +10,10 @@
 #include "mozilla/dom/Directory.h"
 #include "mozilla/dom/FileSystemTaskBase.h"
 #include "mozilla/dom/GetFilesHelper.h"
-#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class BlobImpl;

dom/filesystem/compat/FileSystem.h

@@ -8,7 +8,6 @@
 #define mozilla_dom_FileSystem_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"

dom/filesystem/compat/FileSystemDirectoryReader.h

@@ -8,13 +8,14 @@
 #define mozilla_dom_FileSystemDirectoryReader_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/FileSystemDirectoryEntry.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class Directory;

dom/filesystem/compat/FileSystemEntry.h

@@ -8,7 +8,6 @@
 #define mozilla_dom_FileSystemEntry_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/FileSystemBinding.h"
 #include "nsCycleCollectionParticipant.h"
@@ -16,6 +15,8 @@
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class FileSystem;

dom/gamepad/Gamepad.h

@@ -7,7 +7,6 @@
 #ifndef mozilla_dom_gamepad_Gamepad_h
 #define mozilla_dom_gamepad_Gamepad_h
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/GamepadBinding.h"
 #include "mozilla/dom/GamepadButton.h"
 #include "mozilla/dom/GamepadPose.h"

dom/html/HTMLOptionsCollection.h

@@ -11,13 +11,14 @@
 #include "nsWrapperCache.h"
 
 #include "mozilla/dom/HTMLOptionElement.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCOMPtr.h"
 #include "nsError.h"
 #include "nsGenericHTMLElement.h"
 #include "nsTArray.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class DocGroup;

dom/html/HTMLSelectElement.h

@@ -13,7 +13,6 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/UnionTypes.h"
 #include "mozilla/dom/HTMLOptionsCollection.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCheapSets.h"
 #include "nsCOMPtr.h"
 #include "nsError.h"
@@ -27,6 +26,7 @@ class nsISelectControlFrame;
 
 namespace mozilla {
 
+class ErrorResult;
 class EventChainPostVisitor;
 class EventChainPreVisitor;
 class SelectContentData;

dom/html/TimeRanges.h

@@ -11,10 +11,10 @@
 #include "nsISupports.h"
 #include "nsTArray.h"
 #include "nsWrapperCache.h"
-#include "mozilla/ErrorResult.h"
 #include "TimeUnits.h"
 
 namespace mozilla {
+class ErrorResult;
 
 namespace dom {
 class TimeRanges;

dom/html/nsGenericHTMLElement.h

@@ -13,7 +13,6 @@
 #include "nsIFormControl.h"
 #include "nsGkAtoms.h"
 #include "nsContentCreatorFunctions.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/DOMRect.h"
@@ -27,6 +26,7 @@ class nsIURI;
 struct nsSize;
 
 namespace mozilla {
+class ErrorResult;
 class EventChainPostVisitor;
 class EventChainPreVisitor;
 class EventChainVisitor;

dom/html/nsGenericHTMLFrameElement.h

@@ -8,7 +8,6 @@
 #define nsGenericHTMLFrameElement_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/nsBrowserElement.h"
 
 #include "nsFrameLoader.h"
@@ -17,6 +16,8 @@
 #include "nsIMozBrowserFrame.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 class BrowserParent;
 template <typename>

dom/indexedDB/Key.h

@@ -12,7 +12,6 @@
 #include "js/Array.h"  // JS::GetArrayLength
 #include "js/RootingAPI.h"
 #include "jsapi.h"
-#include "mozilla/ErrorResult.h"
 #include "nsString.h"
 
 class mozIStorageStatement;

dom/ipc/BrowserParent.h

@@ -16,14 +16,9 @@
 #include "mozilla/EventForwards.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/dom/BrowserBridgeParent.h"
-#include "mozilla/dom/File.h"
 #include "mozilla/dom/PBrowserParent.h"
-#include "mozilla/dom/PContent.h"
-#include "mozilla/dom/PFilePickerParent.h"
 #include "mozilla/dom/TabContext.h"
 #include "mozilla/dom/ipc/IdType.h"
-#include "mozilla/gfx/CrossProcessPaint.h"
-#include "mozilla/layers/CompositorBridgeParent.h"
 #include "mozilla/layout/RemoteLayerTreeOwner.h"
 #include "nsCOMPtr.h"
 #include "nsIAuthPromptProvider.h"
@@ -32,17 +27,24 @@
 #include "nsIKeyEventInPluginCallback.h"
 #include "nsIRemoteTab.h"
 #include "nsIWidget.h"
-#include "nsIXULBrowserWindow.h"
 #include "nsWeakReference.h"
 
+class imgIContainer;
+class nsCycleCollectionTraversalCallback;
+class nsDocShellLoadState;
 class nsFrameLoader;
+class nsIBrowser;
 class nsIContent;
-class nsIPrincipal;
-class nsIURI;
-class nsILoadContext;
+class nsIContentSecurityPolicy;
 class nsIDocShell;
+class nsILoadContext;
+class nsIPrincipal;
+class nsIRequest;
+class nsIURI;
 class nsIWebBrowserPersistDocumentReceiver;
 class nsIWebProgress;
+class nsIXULBrowserWindow;
+class nsPIDOMWindowOuter;
 
 namespace mozilla {
 
@@ -50,17 +52,12 @@ namespace a11y {
 class DocAccessibleParent;
 }
 
-namespace layers {
-struct TextureFactoryIdentifier;
-}  // namespace layers
-
 namespace widget {
 struct IMENotification;
 }  // namespace widget
 
 namespace gfx {
 class SourceSurface;
-class DataSourceSurface;
 }  // namespace gfx
 
 namespace dom {

dom/ipc/ClonedErrorHolder.h

@@ -13,12 +13,13 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/StructuredCloneHolder.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 
 class nsIGlobalObject;
 class nsQueryActorChild;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class ClonedErrorHolder final {

dom/ipc/ContentChild.h

@@ -8,14 +8,13 @@
 #define mozilla_dom_ContentChild_h
 
 #include "mozilla/Atomics.h"
-#include "mozilla/dom/MediaControlKeySource.h"
+#include "mozilla/dom/BlobImpl.h"
+#include "mozilla/dom/GetFilesHelper.h"
 #include "mozilla/dom/PContentChild.h"
 #include "mozilla/dom/ProcessActor.h"
 #include "mozilla/dom/RemoteType.h"
 #include "mozilla/ipc/InputStreamUtils.h"
 #include "mozilla/ipc/ProtocolUtils.h"
-#include "mozilla/widget/ThemeChangeKind.h"
-#include "mozilla/LookAndFeel.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/UniquePtr.h"
 #include "nsClassHashtable.h"
@@ -46,10 +45,19 @@ class RemoteSpellcheckEngineChild;
 class ChildProfilerController;
 class BenchmarkStorageChild;
 
+namespace ipc {
+class PChildToParentStreamChild;
+class PFileDescriptorSetChild;
+}  // namespace ipc
+
 namespace loader {
 class PScriptCacheChild;
 }
 
+namespace widget {
+enum class ThemeChangeKind : uint8_t;
+}
+
 using mozilla::loader::PScriptCacheChild;
 
 #if !defined(XP_WIN)
@@ -71,8 +79,8 @@ class AlertObserver;
 class ConsoleListener;
 class ClonedMessageData;
 class BrowserChild;
-class GetFilesHelperChild;
 class TabContext;
+enum class CallerType : uint32_t;
 
 class ContentChild final : public PContentChild,
                            public nsIDOMProcessChild,

dom/ipc/ProcessActor.h

@@ -7,19 +7,17 @@
 #ifndef mozilla_dom_ProcessActor_h
 #define mozilla_dom_ProcessActor_h
 
-#include "nsWrapperCache.h"
-#include "nsISupports.h"
-#include "mozilla/dom/BrowsingContext.h"
-#include "mozilla/ErrorResult.h"
-#include "nsIURI.h"
-#include "nsRefPtrHashtable.h"
-#include "nsString.h"
-#include "mozilla/dom/JSActor.h"
 #include "mozilla/dom/JSActorManager.h"
+#include "nsStringFwd.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
+class JSActorProtocol;
+class JSActorService;
+
 // Common base class for Content{Parent, Child} and InProcess{Parent, Child}.
 class ProcessActor : public JSActorManager {
  protected:

dom/ipc/RemoteBrowser.h

@@ -7,19 +7,15 @@
 #ifndef mozilla_dom_ipc_RemoteBrowser_h
 #define mozilla_dom_ipc_RemoteBrowser_h
 
-#include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/ipc/IdType.h"
-#include "mozilla/dom/EffectsInfo.h"
 #include "mozilla/layers/LayersTypes.h"
-#include "nsILoadContext.h"
-#include "nsIPrincipal.h"
 #include "nsISupports.h"
-#include "nsISupportsImpl.h"
-#include "nsIURI.h"
 #include "nsRect.h"
 #include "Units.h"
 
+class nsDocShellLoadState;
 class nsFrameLoader;
+class nsILoadContext;
 class nsIContent;
 
 namespace mozilla {
@@ -28,6 +24,8 @@ namespace dom {
 
 class BrowserHost;
 class BrowserBridgeHost;
+class BrowsingContext;
+class EffectsInfo;
 class OwnerShowInfo;
 
 /**

dom/ipc/WindowGlobalActor.h

@@ -10,7 +10,6 @@
 #include "nsWrapperCache.h"
 #include "nsISupports.h"
 #include "mozilla/dom/BrowsingContext.h"
-#include "mozilla/ErrorResult.h"
 #include "nsIURI.h"
 #include "nsString.h"
 #include "mozilla/dom/JSActor.h"
@@ -18,6 +17,8 @@
 #include "mozilla/dom/WindowGlobalTypes.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 // Common base class for WindowGlobal{Parent, Child}.

dom/ipc/jsactor/JSActor.h

@@ -10,7 +10,6 @@
 #include "js/TypeDecls.h"
 #include "ipc/IPCMessageUtils.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/PromiseNativeHandler.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsDataHashtable.h"
@@ -20,6 +19,8 @@ class nsIGlobalObject;
 class nsQueryJSActor;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 namespace ipc {

dom/ipc/jsactor/JSActorManager.h

@@ -9,11 +9,12 @@
 
 #include "js/TypeDecls.h"
 #include "mozilla/dom/JSActor.h"
-#include "mozilla/ErrorResult.h"
 #include "nsRefPtrHashtable.h"
 #include "nsString.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace ipc {
 class IProtocol;
 }

dom/ipc/jsactor/JSActorService.h

@@ -8,7 +8,6 @@
 #define mozilla_dom_JSActorService_h
 
 #include "mozilla/dom/BrowsingContext.h"
-#include "mozilla/ErrorResult.h"
 #include "nsIURI.h"
 #include "nsRefPtrHashtable.h"
 #include "nsString.h"
@@ -19,6 +18,8 @@
 #include "mozilla/EventListenerManager.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 struct ProcessActorOptions;

dom/ipc/jsactor/JSProcessActorParent.h

@@ -9,7 +9,6 @@
 
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/JSActor.h"
@@ -18,6 +17,8 @@
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class JSProcessActorParent final : public JSActor {

dom/ipc/jsactor/JSProcessActorProtocol.h

@@ -9,13 +9,14 @@
 
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/JSActorService.h"
-#include "mozilla/ErrorResult.h"
 #include "nsIURI.h"
 #include "nsString.h"
 #include "nsTArray.h"
 #include "nsIObserver.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 struct ProcessActorOptions;

dom/ipc/jsactor/JSWindowActorChild.h

@@ -7,24 +7,30 @@
 #ifndef mozilla_dom_JSWindowActorChild_h
 #define mozilla_dom_JSWindowActorChild_h
 
-#include "js/TypeDecls.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
+#include "js/RootingAPI.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/JSActor.h"
+#include "mozilla/dom/WindowGlobalChild.h"
+#include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsWrapperCache.h"
-#include "nsIDOMProcessChild.h"
+#include "nsIGlobalObject.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"
+
+class nsIDocShell;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 template <typename>
 struct Nullable;
 
+class BrowsingContext;
 class Document;
-class WindowGlobalChild;
 class WindowProxyHolder;
 
 }  // namespace dom

dom/ipc/jsactor/JSWindowActorParent.h

@@ -9,7 +9,6 @@
 
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/JSActor.h"
@@ -17,6 +16,8 @@
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class WindowGlobalParent;

dom/ipc/jsactor/JSWindowActorProtocol.h

@@ -10,7 +10,6 @@
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/JSActorService.h"
 #include "mozilla/extensions/MatchPattern.h"
-#include "mozilla/ErrorResult.h"
 #include "nsIURI.h"
 #include "nsString.h"
 #include "nsTArray.h"
@@ -18,6 +17,8 @@
 #include "nsIDOMEventListener.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 struct WindowActorOptions;

dom/media/MediaStreamError.h

@@ -8,7 +8,6 @@
 #define mozilla_dom_MediaStreamError_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "nsWrapperCache.h"
 #include "js/TypeDecls.h"
 #include "nsPIDOMWindow.h"