Bug 1653229 - Remove unnecessary includes for BindingUtils.h. r=jgilbert

Differential Revision: https://phabricator.services.mozilla.com/D83771
2020-07-22 15:12:10 +00:00 · 2020-07-22 15:12:10 +00:00 · e443211b53
--- a/docshell/base/BrowsingContext.cpp
+++ b/docshell/base/BrowsingContext.cpp
@ -16,6 +16,7 @@
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/dom/FeaturePolicyUtils.h"
 #include "mozilla/dom/HTMLEmbedElement.h"
 #include "mozilla/dom/HTMLIFrameElement.h"
 #include "mozilla/dom/Location.h"
--- a/docshell/base/BrowsingContext.h
+++ b/docshell/base/BrowsingContext.h
@ -16,27 +16,24 @@
 #include "mozilla/Tuple.h"
 #include "mozilla/WeakPtr.h"
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/dom/LoadURIOptionsBinding.h"
+#include "mozilla/dom/FeaturePolicy.h"
 #include "mozilla/dom/LocationBase.h"
 #include "mozilla/dom/MaybeDiscarded.h"
-#include "mozilla/dom/FeaturePolicyUtils.h"
-#include "mozilla/dom/SessionStorageManager.h"
 #include "mozilla/dom/UserActivation.h"
+#include "mozilla/dom/ScreenOrientationBinding.h"
 #include "mozilla/dom/SyncedContext.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsID.h"
 #include "nsIDocShell.h"
-#include "nsString.h"
 #include "nsTArray.h"
 #include "nsWrapperCache.h"
 #include "nsILoadInfo.h"
 #include "nsILoadContext.h"
+#include "nsThreadUtils.h"

 class nsDocShellLoadState;
 class nsGlobalWindowInner;
 class nsGlobalWindowOuter;
-class nsILoadInfo;
 class nsIPrincipal;
 class nsOuterWindowProxy;
 class PickleIterator;
@ -66,8 +63,7 @@ class ContentParent;
 class Element;
 template <typename>
 struct Nullable;
-template <typename T>
-class Sequence;
+class SessionStorageManager;
 class StructuredCloneHolder;
 class WindowContext;
 struct WindowPostMessageOptions;
--- a/docshell/base/BrowsingContextGroup.h
+++ b/docshell/base/BrowsingContextGroup.h
@ -23,6 +23,7 @@ namespace dom {
 class BrowsingContext;
 class WindowContext;
 class ContentParent;
+class DocGroup;

 // A BrowsingContextGroup represents the Unit of Related Browsing Contexts in
 // the standard.
--- a/docshell/base/CanonicalBrowsingContext.h
+++ b/docshell/base/CanonicalBrowsingContext.h
@ -31,6 +31,7 @@ class DocumentLoadListener;
 namespace dom {

 class BrowserParent;
+struct LoadURIOptions;
 class MediaController;
 class SessionHistoryInfo;
 class SessionHistoryEntry;
--- a/docshell/base/SyncedContext.h
+++ b/docshell/base/SyncedContext.h
@ -7,7 +7,6 @@
 #ifndef mozilla_dom_SyncedContext_h
 #define mozilla_dom_SyncedContext_h

-#include "mozilla/dom/MaybeDiscarded.h"
 #include "mozilla/EnumSet.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/RefPtr.h"
--- a/docshell/base/WindowContext.h
+++ b/docshell/base/WindowContext.h
@ -11,8 +11,14 @@
 #include "mozilla/Span.h"
 #include "mozilla/dom/MaybeDiscarded.h"
 #include "mozilla/dom/SyncedContext.h"
+#include "nsILoadInfo.h"
+#include "nsWrapperCache.h"
+
+class nsIGlobalObject;

 namespace mozilla {
+class LogModule;
+
 namespace dom {

 class WindowGlobalParent;
--- a/docshell/base/nsDocShellLoadState.h
+++ b/docshell/base/nsDocShellLoadState.h
@ -11,6 +11,7 @@
 #include "mozilla/dom/SessionHistoryEntry.h"

 // Helper Classes
+#include "mozilla/Maybe.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsDocShellLoadTypes.h"
@ -266,8 +267,8 @@ class nsDocShellLoadState final {
  // Compute the load flags to be used by creating channel.  aUriModified and
  // aIsXFOError are expected to be Nothing when called from Parent process.
  nsLoadFlags CalculateChannelLoadFlags(
-      mozilla::dom::BrowsingContext* aBrowsingContext, Maybe<bool> aUriModified,
-      Maybe<bool> aIsXFOError);
+      mozilla::dom::BrowsingContext* aBrowsingContext,
+      mozilla::Maybe<bool> aUriModified, mozilla::Maybe<bool> aIsXFOError);

  mozilla::dom::DocShellLoadStateInit Serialize();

--- a/dom/base/nsFrameLoader.h
+++ b/dom/base/nsFrameLoader.h
@ -12,28 +12,35 @@
 #ifndef nsFrameLoader_h_
 #define nsFrameLoader_h_

-#include "nsDocShell.h"
-#include "nsIFrame.h"
-#include "nsStringFwd.h"
-#include "nsPoint.h"
-#include "nsSize.h"
-#include "nsWrapperCache.h"
-#include "nsIURI.h"
-#include "nsFrameMessageManager.h"
-#include "mozilla/dom/BindingUtils.h"
-#include "mozilla/dom/BrowsingContext.h"
-#include "mozilla/dom/Element.h"
-#include "mozilla/dom/RemoteBrowser.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/ScrollbarPreferences.h"
-#include "mozilla/layers/LayersTypes.h"
-#include "nsStubMutationObserver.h"
+#include <cstdint>
+#include "ErrorList.h"
 #include "Units.h"
-#include "nsPluginTags.h"
+#include "js/RootingAPI.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/dom/BrowsingContext.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/Element.h"
+#include "mozilla/dom/Nullable.h"
+#include "mozilla/dom/WindowProxyHolder.h"
+#include "mozilla/layers/LayersTypes.h"
+#include "nsCOMPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsDocShell.h"
+#include "nsFrameMessageManager.h"
+#include "nsID.h"
+#include "nsIFrame.h"
+#include "nsIMutationObserver.h"
+#include "nsISupports.h"
+#include "nsRect.h"
+#include "nsStringFwd.h"
+#include "nsStubMutationObserver.h"
+#include "nsWrapperCache.h"

 class nsIURI;
 class nsSubDocumentFrame;
-class nsView;
 class AutoResetInShow;
 class AutoResetInFrameSwap;
 class nsFrameLoaderOwner;
@ -41,7 +48,6 @@ class nsIRemoteTab;
 class nsIDocShellTreeItem;
 class nsIDocShellTreeOwner;
 class nsILoadContext;
-class nsIMessageSender;
 class nsIPrintSettings;
 class nsIWebBrowserPersistDocumentReceiver;
 class nsIWebProgressListener;
@ -57,12 +63,11 @@ class ContentParent;
 class TabListener;
 class InProcessBrowserChildMessageManager;
 class MessageSender;
-class PBrowserParent;
 class ProcessMessageManager;
-class Promise;
 class BrowserParent;
 class MutableTabContext;
 class BrowserBridgeChild;
+class RemoteBrowser;
 struct RemotenessOptions;

 namespace ipc {
--- a/dom/base/nsGlobalWindowInner.cpp
+++ b/dom/base/nsGlobalWindowInner.cpp
@ -35,6 +35,7 @@
 #include "mozilla/dom/IdleRequest.h"
 #include "mozilla/dom/Performance.h"
 #include "mozilla/dom/ScriptLoader.h"
+#include "mozilla/dom/SessionStorageManager.h"
 #include "mozilla/dom/StorageEvent.h"
 #include "mozilla/dom/StorageEventBinding.h"
 #include "mozilla/dom/StorageNotifierService.h"
--- a/dom/cache/TypeUtils.h
+++ b/dom/cache/TypeUtils.h
@ -7,11 +7,11 @@
 #ifndef mozilla_dom_cache_TypesUtils_h
 #define mozilla_dom_cache_TypesUtils_h

-#include "mozilla/Attributes.h"
-#include "mozilla/dom/BindingUtils.h"
-#include "mozilla/dom/InternalHeaders.h"
-#include "mozilla/dom/SafeRefPtr.h"
-#include "nsError.h"
+#include "mozilla/AlreadyAddRefed.h"     // for already_AddRefed
+#include "mozilla/UniquePtr.h"           // for UniquePtr
+#include "mozilla/dom/HeadersBinding.h"  // for HeadersGuardEnum, HeadersGua...
+#include "mozilla/dom/SafeRefPtr.h"      // for SafeRefPtr
+#include "nsStringFwd.h"                 // for nsACString, nsAString

 class nsIGlobalObject;
 class nsIAsyncInputStream;
@ -27,6 +27,7 @@ class AutoIPCStream;
 namespace dom {

 struct CacheQueryOptions;
+class InternalHeaders;
 class InternalRequest;
 class InternalResponse;
 class OwningRequestOrUSVString;
--- a/dom/canvas/ImageData.h
+++ b/dom/canvas/ImageData.h
@ -7,19 +7,20 @@
 #ifndef mozilla_dom_ImageData_h
 #define mozilla_dom_ImageData_h

-#include "mozilla/Attributes.h"
-#include "mozilla/dom/BindingUtils.h"
-#include "mozilla/dom/TypedArray.h"
-#include <stdint.h>
-
-#include "nsCycleCollectionParticipant.h"
-#include "nsISupportsImpl.h"
+#include <cstdint>
+#include <utility>
 #include "js/RootingAPI.h"
-#include "js/StructuredClone.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/dom/TypedArray.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsISupports.h"

 class nsIGlobalObject;

 namespace mozilla {
+class ErrorResult;
+
 namespace dom {

 class ImageData final : public nsISupports {
--- a/dom/canvas/WebGLContextUtils.h
+++ b/dom/canvas/WebGLContextUtils.h
@ -6,13 +6,8 @@
 #ifndef WEBGL_CONTEXT_UTILS_H_
 #define WEBGL_CONTEXT_UTILS_H_

-#include "WebGLContext.h"
-
-#include "mozilla/Assertions.h"
-#include "mozilla/dom/BindingUtils.h"
-#include "mozilla/dom/TypedArray.h"
-
 #include "WebGLStrongTypes.h"
+#include "WebGLTypes.h"

 namespace mozilla {

--- a/dom/events/MessageEvent.h
+++ b/dom/events/MessageEvent.h
@ -7,9 +7,17 @@
 #ifndef mozilla_dom_MessageEvent_h_
 #define mozilla_dom_MessageEvent_h_

+#include "js/RootingAPI.h"
+#include "js/Value.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/BasicEvents.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/dom/Event.h"
-#include "mozilla/dom/BindingUtils.h"
 #include "nsCycleCollectionParticipant.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"
+#include "nsTArray.h"

 namespace mozilla {
 namespace dom {
--- a/dom/events/StorageEvent.h
+++ b/dom/events/StorageEvent.h
@ -7,11 +7,16 @@
 #ifndef mozilla_dom_StorageEvent_h
 #define mozilla_dom_StorageEvent_h

-#include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
-#include "mozilla/dom/BindingUtils.h"
+#include "js/RootingAPI.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/dom/Event.h"
-#include "mozilla/dom/StorageEventBinding.h"
+#include "nsCOMPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsIPrincipal.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"

 class nsIPrincipal;

@ -19,6 +24,7 @@ namespace mozilla {
 namespace dom {

 class Storage;
+struct StorageEventInit;

 class StorageEvent : public Event {
 public:
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@ -65,6 +65,7 @@
 #include "mozilla/dom/RemoteWorkerService.h"
 #include "mozilla/dom/ScreenOrientation.h"
 #include "mozilla/dom/ServiceWorkerManager.h"
+#include "mozilla/dom/SessionStorageManager.h"
 #include "mozilla/dom/URLClassifierChild.h"
 #include "mozilla/dom/WindowGlobalChild.h"
 #include "mozilla/dom/WorkerDebugger.h"
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@ -116,6 +116,7 @@
 #include "mozilla/dom/ServiceWorkerManager.h"
 #include "mozilla/dom/ServiceWorkerRegistrar.h"
 #include "mozilla/dom/ServiceWorkerUtils.h"
+#include "mozilla/dom/SessionStorageManager.h"
 #include "mozilla/dom/StorageIPC.h"
 #include "mozilla/dom/URLClassifierParent.h"
 #include "mozilla/dom/WakeLock.h"
--- a/dom/ipc/RemoteBrowser.h
+++ b/dom/ipc/RemoteBrowser.h
@ -19,6 +19,8 @@
 #include "nsRect.h"
 #include "Units.h"

+class nsFrameLoader;
+
 namespace mozilla {

 namespace dom {
--- a/dom/media/GetUserMediaRequest.h
+++ b/dom/media/GetUserMediaRequest.h
@ -5,12 +5,16 @@
 #ifndef GetUserMediaRequest_h__
 #define GetUserMediaRequest_h__

-#include "mozilla/ErrorResult.h"
+#include <cstdint>
+#include "js/RootingAPI.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/UniquePtr.h"
-#include "nsISupportsImpl.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsISupports.h"
+#include "nsString.h"
 #include "nsWrapperCache.h"
-#include "mozilla/dom/BindingUtils.h"
-#include "nsPIDOMWindow.h"
+
+class nsPIDOMWindowInner;

 namespace mozilla {
 namespace dom {
--- a/dom/media/MediaDeviceInfo.h
+++ b/dom/media/MediaDeviceInfo.h
@ -5,11 +5,14 @@
 #ifndef mozilla_dom_MediaDeviceInfo_h
 #define mozilla_dom_MediaDeviceInfo_h

-#include "mozilla/ErrorResult.h"
-#include "nsISupportsImpl.h"
-#include "mozilla/dom/BindingUtils.h"
-#include "MediaDeviceInfoBinding.h"
-#include "nsPIDOMWindow.h"
+#include "js/RootingAPI.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/dom/MediaDeviceInfoBinding.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsID.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"
+#include "nsWrapperCache.h"

 namespace mozilla {
 namespace dom {
--- a/dom/media/MediaDevices.h
+++ b/dom/media/MediaDevices.h
@ -6,11 +6,15 @@
 #define mozilla_dom_MediaDevices_h

 #include "MediaEventSource.h"
-#include "mozilla/ErrorResult.h"
-#include "nsISupportsImpl.h"
+#include "js/RootingAPI.h"
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/DOMEventTargetHelper.h"
-#include "mozilla/dom/BindingUtils.h"
-#include "nsPIDOMWindow.h"
+#include "mozilla/UseCounter.h"
+#include "mozilla/dom/BindingDeclarations.h"
+#include "nsCOMPtr.h"
+#include "nsID.h"
+#include "nsISupports.h"
+#include "nsITimer.h"

 namespace mozilla {
 namespace dom {
--- a/dom/media/eme/MediaEncryptedEvent.h
+++ b/dom/media/eme/MediaEncryptedEvent.h
@ -7,20 +7,19 @@
 #ifndef mozilla_dom_MediaKeyNeededEvent_h__
 #define mozilla_dom_MediaKeyNeededEvent_h__

-#include "mozilla/dom/MediaEncryptedEventBinding.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
-#include "nsCycleCollectionParticipant.h"
-#include "nsWrapperCache.h"
-#include "nsCOMPtr.h"
+#include <cstdint>
+#include "js/RootingAPI.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/dom/Event.h"
-#include "mozilla/dom/TypedArray.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/dom/BindingUtils.h"
-#include "js/TypeDecls.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"
+#include "nsTArray.h"

 namespace mozilla {
 namespace dom {
+struct MediaKeyNeededEventInit;

 class MediaEncryptedEvent final : public Event {
 public:
--- a/dom/media/mediacapabilities/MediaCapabilities.h
+++ b/dom/media/mediacapabilities/MediaCapabilities.h
@ -7,20 +7,24 @@
 #ifndef mozilla_dom_MediaCapabilities_h_
 #define mozilla_dom_MediaCapabilities_h_

-#include "DecoderDoctorLogger.h"
-#include "MediaContainerType.h"
-#include "js/TypeDecls.h"
+#include "DDLoggedTypeTraits.h"
+#include "js/RootingAPI.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/Maybe.h"
-#include "mozilla/UniquePtr.h"
-#include "mozilla/dom/BindingUtils.h"
+#include "mozilla/dom/NonRefcountedDOMObject.h"
 #include "nsCOMPtr.h"
-#include "nsCycleCollectionNoteChild.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsIGlobalObject.h"
 #include "nsISupports.h"
+#include "nsStringFwd.h"
 #include "nsWrapperCache.h"

+class nsIGlobalObject;
+
 namespace mozilla {
+class ErrorResult;
+class MediaContainerType;
+
 namespace layers {
 class KnowsCompositor;
 }
--- a/dom/media/mediacontrol/PositionStateEvent.h
+++ b/dom/media/mediacontrol/PositionStateEvent.h
@ -10,15 +10,16 @@
 #ifndef mozilla_dom_PositionStateEvent_h
 #define mozilla_dom_PositionStateEvent_h

-#include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
-#include "mozilla/dom/BindingUtils.h"
+#include "js/RootingAPI.h"
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/dom/Event.h"
-#include "mozilla/dom/PositionStateEventBinding.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"

 struct JSContext;
 namespace mozilla {
 namespace dom {
+struct PositionStateEventInit;

 class PositionStateEvent : public Event {
 public:
--- a/dom/midi/MIDIMessageEvent.h
+++ b/dom/midi/MIDIMessageEvent.h
@ -7,16 +7,21 @@
 #ifndef mozilla_dom_MIDIMessageEvent_h
 #define mozilla_dom_MIDIMessageEvent_h

-#include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
+#include <cstdint>
+#include "js/RootingAPI.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/TimeStamp.h"
-#include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/Event.h"
-#include "mozilla/dom/MIDIMessageEventBinding.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"
+#include "nsTArray.h"

 struct JSContext;
 namespace mozilla {
 namespace dom {
+struct MIDIMessageEventInit;

 /**
 * Event that fires whenever a MIDI message is received by the MIDIInput object.
--- a/dom/reporting/Report.h
+++ b/dom/reporting/Report.h
@ -7,9 +7,14 @@
 #ifndef mozilla_dom_Report_h
 #define mozilla_dom_Report_h

-#include "mozilla/Attributes.h"
-#include "mozilla/dom/BindingUtils.h"
+#include "js/RootingAPI.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/RefPtr.h"
+#include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
+#include "nsISupports.h"
+#include "nsString.h"
 #include "nsWrapperCache.h"

 class nsIGlobalObject;
--- a/dom/reporting/ReportBody.h
+++ b/dom/reporting/ReportBody.h
@ -7,9 +7,10 @@
 #ifndef mozilla_dom_ReportBody_h
 #define mozilla_dom_ReportBody_h

-#include "mozilla/Attributes.h"
-#include "mozilla/dom/BindingUtils.h"
+#include "mozilla/Assertions.h"
+#include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
+#include "nsISupports.h"
 #include "nsWrapperCache.h"

 class nsIGlobalObject;
--- a/dom/reporting/ReportingObserver.h
+++ b/dom/reporting/ReportingObserver.h
@ -7,18 +7,25 @@
 #ifndef mozilla_dom_ReportingObserver_h
 #define mozilla_dom_ReportingObserver_h

+#include "js/RootingAPI.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/dom/BindingUtils.h"
+#include "mozilla/RefPtr.h"
+#include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsWeakReference.h"
-#include "nsWrapperCache.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"
 #include "nsTArray.h"
+#include "nsWrapperCache.h"

 class nsIGlobalObject;

 namespace mozilla {
-namespace dom {
+class ErrorResult;

+namespace dom {
+class GlobalObject;
 class Report;
 class ReportingObserverCallback;
 struct ReportingObserverOptions;
--- a/dom/reporting/TestingDeprecatedInterface.h
+++ b/dom/reporting/TestingDeprecatedInterface.h
@ -7,13 +7,19 @@
 #ifndef mozilla_dom_TestingDeprecatedInterface_h
 #define mozilla_dom_TestingDeprecatedInterface_h

-#include "mozilla/Attributes.h"
-#include "mozilla/dom/BindingUtils.h"
+#include "js/RootingAPI.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
+#include "nsISupports.h"
 #include "nsWrapperCache.h"

+class nsIGlobalObject;
+
 namespace mozilla {
 namespace dom {
+class GlobalObject;

 class TestingDeprecatedInterface final : public nsISupports,
                                         public nsWrapperCache {
--- a/dom/security/featurepolicy/FeaturePolicy.cpp
+++ b/dom/security/featurepolicy/FeaturePolicy.cpp
@ -8,6 +8,7 @@
 #include "mozilla/dom/FeaturePolicyBinding.h"
 #include "mozilla/dom/FeaturePolicyParser.h"
 #include "mozilla/dom/FeaturePolicyUtils.h"
+#include "mozilla/StaticPrefs_dom.h"
 #include "nsContentUtils.h"
 #include "nsNetUtil.h"

--- a/dom/security/featurepolicy/FeaturePolicy.h
+++ b/dom/security/featurepolicy/FeaturePolicy.h
@ -7,11 +7,9 @@
 #ifndef mozilla_dom_FeaturePolicy_h
 #define mozilla_dom_FeaturePolicy_h

-#include "mozilla/Attributes.h"
-#include "mozilla/dom/BindingUtils.h"
-#include "mozilla/dom/Feature.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsString.h"
+#include "nsIPrincipal.h"
+#include "nsStringFwd.h"
 #include "nsTArray.h"
 #include "nsWrapperCache.h"

@ -55,12 +53,12 @@
 * HTTP header support.
 **/

-class nsIHttpChannel;
 class nsINode;

 namespace mozilla {
 namespace dom {
 class Document;
+class Feature;

 class FeaturePolicyUtils;

--- a/dom/security/featurepolicy/FeaturePolicyUtils.cpp
+++ b/dom/security/featurepolicy/FeaturePolicyUtils.cpp
@ -13,6 +13,7 @@
 #include "mozilla/dom/ReportingUtils.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/dom/Document.h"
+#include "nsJSUtils.h"

 namespace mozilla {
 namespace dom {
--- a/dom/serviceworkers/ServiceWorkerEvents.cpp
+++ b/dom/serviceworkers/ServiceWorkerEvents.cpp
@ -33,6 +33,7 @@
 #include "mozilla/dom/WorkerPrivate.h"
 #include "mozilla/dom/WorkerScope.h"
 #include "mozilla/net/NeckoChannelParams.h"
+#include "mozilla/Telemetry.h"
 #include "nsComponentManagerUtils.h"
 #include "nsContentPolicyUtils.h"
 #include "nsContentUtils.h"
--- a/dom/serviceworkers/ServiceWorkerManager.h
+++ b/dom/serviceworkers/ServiceWorkerManager.h
@ -7,33 +7,30 @@
 #ifndef mozilla_dom_workers_serviceworkermanager_h
 #define mozilla_dom_workers_serviceworkermanager_h

-#include "nsIServiceWorkerManager.h"
-#include "nsCOMPtr.h"
-
+#include <cstdint>
+#include "ErrorList.h"
 #include "ServiceWorkerShutdownState.h"
-#include "ipc/IPCMessageUtils.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/AutoRestore.h"
-#include "mozilla/ConsoleReportCollector.h"
+#include "js/ErrorReport.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/HashTable.h"
-#include "mozilla/LinkedList.h"
 #include "mozilla/MozPromise.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/TypedEnumBits.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/UniquePtr.h"
-#include "mozilla/WeakPtr.h"
-#include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/ClientHandle.h"
-#include "mozilla/dom/Promise.h"
-#include "mozilla/dom/ServiceWorkerRegistrar.h"
-#include "mozilla/dom/ServiceWorkerRegistrarTypes.h"
+#include "mozilla/dom/ClientOpPromise.h"
+#include "mozilla/dom/ServiceWorkerRegistrationBinding.h"
 #include "mozilla/dom/ServiceWorkerRegistrationInfo.h"
 #include "mozilla/dom/ServiceWorkerUtils.h"
-#include "mozilla/ipc/BackgroundUtils.h"
+#include "mozilla/mozalloc.h"
 #include "nsClassHashtable.h"
-#include "nsDataHashtable.h"
-#include "nsRefPtrHashtable.h"
-#include "nsTArrayForwardDeclare.h"
+#include "nsContentUtils.h"
+#include "nsHashKeys.h"
+#include "nsIObserver.h"
+#include "nsIServiceWorkerManager.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"
+#include "nsTArray.h"

 class nsIConsoleReportCollector;

--- a/dom/serviceworkers/ServiceWorkerRegistrationInfo.h
+++ b/dom/serviceworkers/ServiceWorkerRegistrationInfo.h
@ -12,6 +12,7 @@
 #include "mozilla/dom/ServiceWorkerInfo.h"
 #include "mozilla/dom/ServiceWorkerRegistrationBinding.h"
 #include "mozilla/dom/ServiceWorkerRegistrationDescriptor.h"
+#include "nsContentUtils.h"
 #include "nsProxyRelease.h"
 #include "nsTObserverArray.h"

--- a/dom/storage/SessionStorageManager.cpp
+++ b/dom/storage/SessionStorageManager.cpp
@ -8,6 +8,7 @@

 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/ContentParent.h"
+#include "mozilla/OriginAttributes.h"
 #include "SessionStorage.h"
 #include "SessionStorageCache.h"
 #include "SessionStorageObserver.h"
@ -394,5 +395,11 @@ nsresult SessionStorageManager::Observe(
  return NS_OK;
 }

+RefPtr<BrowsingContext> SessionStorageManager::GetBrowsingContext() const {
+  return mBrowsingContext;
+}
+
+SessionStorageManager::OriginRecord::~OriginRecord() = default;
+
 }  // namespace dom
 }  // namespace mozilla
--- a/dom/storage/SessionStorageManager.h
+++ b/dom/storage/SessionStorageManager.h
@ -9,13 +9,16 @@

 #include "nsIDOMStorageManager.h"
 #include "nsClassHashtable.h"
+#include "nsCycleCollectionParticipant.h"
 #include "nsHashKeys.h"
-#include "nsRefPtrHashtable.h"
 #include "StorageObserver.h"

 namespace mozilla {
+class OriginAttributesPattern;
+
 namespace dom {

+class BrowsingContext;
 class ContentParent;
 class KeyValuePair;
 class SessionStorageCache;
@ -51,9 +54,7 @@ class SessionStorageManager final : public nsIDOMSessionStorageManager,

  NS_DECL_CYCLE_COLLECTION_CLASS(SessionStorageManager)

-  RefPtr<BrowsingContext> GetBrowsingContext() const {
-    return mBrowsingContext;
-  }
+  RefPtr<BrowsingContext> GetBrowsingContext() const;

  void SendSessionStorageDataToParentProcess();
  void SendSessionStorageDataToContentProcess(ContentParent* aActor,
@ -94,6 +95,11 @@ class SessionStorageManager final : public nsIDOMSessionStorageManager,
                                        RefPtr<SessionStorageCache>* aRetVal);

  struct OriginRecord {
+    OriginRecord() = default;
+    OriginRecord(OriginRecord&&) = default;
+    OriginRecord& operator=(OriginRecord&&) = default;
+    ~OriginRecord();
+
    RefPtr<SessionStorageCache> mCache;
    nsTHashtable<nsUint64HashKey> mKnownTo;
  };
--- a/dom/storage/StorageDBThread.cpp
+++ b/dom/storage/StorageDBThread.cpp
@ -28,6 +28,7 @@
 #include "nsVariant.h"
 #include "mozilla/EventQueue.h"
 #include "mozilla/IOInterposer.h"
+#include "mozilla/OriginAttributes.h"
 #include "mozilla/ThreadEventQueue.h"
 #include "mozilla/Services.h"
 #include "mozilla/Tokenizer.h"
--- a/dom/storage/StorageDBThread.h
+++ b/dom/storage/StorageDBThread.h
@ -13,6 +13,7 @@
 #include "mozilla/Atomics.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/BasePrincipal.h"
+#include "mozilla/OriginAttributes.h"
 #include "mozilla/storage/StatementCache.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtr.h"
--- a/dom/vr/VRDisplayEvent.h
+++ b/dom/vr/VRDisplayEvent.h
@ -7,13 +7,18 @@
 #ifndef mozilla_dom_VRDisplayEvent_h_
 #define mozilla_dom_VRDisplayEvent_h_

-#include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
-#include "mozilla/dom/VRDisplayEventBinding.h"
-#include "mozilla/dom/BindingUtils.h"
+#include "js/RootingAPI.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/dom/Event.h"
-
-#include "gfxVR.h"
+#include "mozilla/dom/Nullable.h"
+#include "mozilla/dom/VRDisplay.h"
+#include "mozilla/dom/VRDisplayEventBinding.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"

 struct JSContext;

--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
@ -45,6 +45,7 @@
 #include "mozilla/dom/WindowContext.h"
 #include "mozilla/StorageAccess.h"
 #include "mozilla/StoragePrincipalHelper.h"
+#include "mozilla/Telemetry.h"
 #include "mozilla/ThreadEventQueue.h"
 #include "mozilla/ThrottledEventQueue.h"
 #include "mozilla/TimelineConsumers.h"
--- a/toolkit/components/sessionstore/SessionStoreUtils.cpp
+++ b/toolkit/components/sessionstore/SessionStoreUtils.cpp
@ -12,6 +12,7 @@
 #include "mozilla/dom/HTMLSelectElement.h"
 #include "mozilla/dom/HTMLTextAreaElement.h"
 #include "mozilla/dom/RootedDictionary.h"
+#include "mozilla/dom/SessionStorageManager.h"
 #include "mozilla/dom/SessionStoreUtils.h"
 #include "mozilla/dom/txIXPathContext.h"
 #include "mozilla/dom/WindowProxyHolder.h"
--- a/toolkit/components/windowwatcher/nsWindowWatcher.cpp
+++ b/toolkit/components/windowwatcher/nsWindowWatcher.cpp
@ -68,6 +68,7 @@
 #include "mozilla/dom/BrowserParent.h"
 #include "mozilla/dom/BrowserHost.h"
 #include "mozilla/dom/DocGroup.h"
+#include "mozilla/dom/SessionStorageManager.h"
 #include "nsIAppWindow.h"
 #include "nsIXULBrowserWindow.h"
 #include "nsGlobalWindow.h"