Backed out 12 changesets (bug 1825325, bug 1825336, bug 1825333, bug 1825332, bug 1825324, bug 1824557, bug 1825328, bug 1825335, bug 1825330, bug 1825329, bug 1825327, bug 1825331) for causing build bustages in nsClipboard.cpp CLOSED TREE

Backed out changeset 9de3ed24d3a0 (bug 1825336) Backed out changeset aef787728f19 (bug 1825335) Backed out changeset a04c341244c1 (bug 1825333) Backed out changeset e3ad15f762ba (bug 1825332) Backed out changeset eed23da92a27 (bug 1825331) Backed out changeset 8213bb54376e (bug 1825330) Backed out changeset 747ec5ac4994 (bug 1825329) Backed out changeset e91ff431f92d (bug 1825328) Backed out changeset 59c18d13768b (bug 1825327) Backed out changeset 538096d99e49 (bug 1825325) Backed out changeset c76eb9d9b095 (bug 1825324) Backed out changeset 8b81410eb686 (bug 1824557)
2023-03-31 12:58:53 -04:00 · 2023-03-31 12:58:53 -04:00 · 8e06a7a853
--- a/accessible/windows/msaa/Compatibility.h
+++ b/accessible/windows/msaa/Compatibility.h
@ -9,8 +9,6 @@

 #include <windows.h>
 #include "mozilla/Maybe.h"
-#include "nsString.h"
-
 #include <stdint.h>

 namespace mozilla {
--- a/docshell/base/nsDocShellLoadState.h
+++ b/docshell/base/nsDocShellLoadState.h
@ -24,8 +24,8 @@ class nsIURI;
 class nsIDocShell;
 class nsIChannel;
 class nsIReferrerInfo;
+class OriginAttibutes;
 namespace mozilla {
-class OriginAttributes;
 template <typename, class>
 class UniquePtr;
 namespace dom {
--- a/dom/interfaces/base/nsIBrowserChild.idl
+++ b/dom/interfaces/base/nsIBrowserChild.idl
@ -6,10 +6,6 @@
 #include "domstubs.idl"
 #include "nsIDroppedLinkHandler.idl"

-%{C++
-#include "mozilla/dom/BindingDeclarations.h"
-%}
-
 interface nsIWebBrowserChrome;

 webidl ContentFrameMessageManager;
--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@ -134,3 +134,5 @@ TEST_DIRS += [
 include("/ipc/chromium/chromium-config.mozbuild")

 FINAL_LIBRARY = "xul"
+
+REQUIRES_UNIFIED_BUILD = True
--- a/ipc/chromium/src/base/condition_variable_posix.cc
+++ b/ipc/chromium/src/base/condition_variable_posix.cc
@ -11,7 +11,6 @@
 #include <sys/time.h>

 #include "base/lock.h"
-#include "base/logging.h"
 #include "base/time.h"
 #include "build/build_config.h"

--- a/ipc/chromium/src/base/message_loop.cc
+++ b/ipc/chromium/src/base/message_loop.cc
@ -52,6 +52,18 @@ static base::ThreadLocalPointer<MessageLoop>& get_tls_ptr() {

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

+// Logical events for Histogram profiling. Run with -message-loop-histogrammer
+// to get an accounting of messages and actions taken on each thread.
+static const int kTaskRunEvent = 0x1;
+static const int kTimerEvent = 0x2;
+
+// Provide range of message IDs for use in histogramming and debug display.
+static const int kLeastNonZeroMessageId = 1;
+static const int kMaxMessageId = 1099;
+static const int kNumberOfDistinctMessagesDisplayed = 1100;
+
+//------------------------------------------------------------------------------
+
 #if defined(OS_WIN)

 // Upon a SEH exception in this thread, it restores the original unhandled
--- a/ipc/chromium/src/base/pickle.cc
+++ b/ipc/chromium/src/base/pickle.cc
@ -32,6 +32,10 @@ static const uint32_t kDefaultSegmentCapacity = 4096;

 static const char kBytePaddingMarker = char(0xbf);

+// Note: we round the time to the nearest millisecond. So a min value of 1 ms
+// actually captures from 500us and above.
+static const uint32_t kMinTelemetryIPCReadLatencyMs = 1;
+
 namespace {

 // We want to copy data to our payload as efficiently as possible.
--- a/ipc/chromium/src/base/process_util_mac.mm
+++ b/ipc/chromium/src/base/process_util_mac.mm
@ -10,7 +10,6 @@
 #include <os/availability.h>
 #include <spawn.h>
 #include <sys/wait.h>
-#include <unistd.h>

 #include <string>

--- a/ipc/chromium/src/base/process_util_posix.cc
+++ b/ipc/chromium/src/base/process_util_posix.cc
@ -47,6 +47,8 @@
 #  define HAVE_WAITID
 #endif

+const int kMicrosecondsPerSecond = 1000000;
+
 namespace base {

 ProcessId GetCurrentProcId() { return getpid(); }
--- a/ipc/chromium/src/chrome/common/ipc_channel_utils.cc
+++ b/ipc/chromium/src/chrome/common/ipc_channel_utils.cc
@ -8,7 +8,6 @@

 #include "mozilla/ProfilerMarkers.h"
 #include "chrome/common/ipc_message.h"
-#include "base/process.h"

 namespace IPC {

--- a/media/libcubeb/gtest/moz.build
+++ b/media/libcubeb/gtest/moz.build
@ -72,3 +72,5 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
    ]

 FINAL_LIBRARY = 'xul-gtest'
+
+REQUIRES_UNIFIED_BUILD = True
--- a/media/libcubeb/test/common.h
+++ b/media/libcubeb/test/common.h
@ -28,7 +28,7 @@ ARRAY_LENGTH(T(&)[N])
  return N;
 }

-inline void delay(unsigned int ms)
+void delay(unsigned int ms)
 {
 #if defined(_WIN32)
  Sleep(ms);
@ -48,7 +48,7 @@ typedef struct {
  uint32_t const layout;
 } layout_info;

-inline int has_available_input_device(cubeb * ctx)
+int has_available_input_device(cubeb * ctx)
 {
  cubeb_device_collection devices;
  int input_device_available = 0;
@ -80,7 +80,7 @@ inline int has_available_input_device(cubeb * ctx)
  return !!input_device_available;
 }

-inline void print_log(const char * msg, ...)
+void print_log(const char * msg, ...)
 {
  va_list args;
  va_start(args, msg);
@ -91,7 +91,7 @@ inline void print_log(const char * msg, ...)
 /** Initialize cubeb with backend override.
 *  Create call cubeb_init passing value for CUBEB_BACKEND env var as
 *  override. */
-inline int common_init(cubeb ** ctx, char const * ctx_name)
+int common_init(cubeb ** ctx, char const * ctx_name)
 {
 #ifdef ENABLE_NORMAL_LOG
  if (cubeb_set_log_callback(CUBEB_LOG_NORMAL, print_log) != CUBEB_OK) {
--- a/memory/mozalloc/moz.build
+++ b/memory/mozalloc/moz.build
@ -55,3 +55,5 @@ LOCAL_INCLUDES += [
 ]

 DIST_INSTALL = True
+
+REQUIRES_UNIFIED_BUILD = True
--- a/memory/mozjemalloc_info/moz.build
+++ b/memory/mozjemalloc_info/moz.build
@ -37,3 +37,5 @@ UNIFIED_SOURCES += [
 DisableStlWrapping()

 include("/mozglue/build/replace_malloc.mozbuild")
+
+REQUIRES_UNIFIED_BUILD = True
--- a/storage/moz.build
+++ b/storage/moz.build
@ -107,3 +107,5 @@ LOCAL_INCLUDES += [
 ]

 CXXFLAGS += CONFIG["SQLITE_CFLAGS"]
+
+REQUIRES_UNIFIED_BUILD = True
--- a/storage/mozStorageAsyncStatementExecution.cpp
+++ b/storage/mozStorageAsyncStatementExecution.cpp
@ -21,7 +21,6 @@
 #include "mozilla/Telemetry.h"

 #ifndef MOZ_STORAGE_SORTWARNING_SQL_DUMP
-#  include "mozilla/Logging.h"
 extern mozilla::LazyLogModule gStorageLog;
 #endif

--- a/toolkit/components/reputationservice/ApplicationReputationTelemetryUtils.cpp
+++ b/toolkit/components/reputationservice/ApplicationReputationTelemetryUtils.cpp
@ -4,7 +4,6 @@

 #include "ApplicationReputationTelemetryUtils.h"
 #include "mozilla/Assertions.h"
-#include "chrome/common/safe_browsing/csd.pb.h"

 using ServerLabel = mozilla::Telemetry::LABELS_APPLICATION_REPUTATION_SERVER_2;
 using ServerVerdictLabel =
--- a/toolkit/components/reputationservice/LoginReputationIPC.cpp
+++ b/toolkit/components/reputationservice/LoginReputationIPC.cpp
@ -6,7 +6,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "LoginReputationIPC.h"
-#include "LoginReputation.h"
 #include "mozilla/Components.h"
 #include "mozilla/Unused.h"

--- a/toolkit/components/reputationservice/moz.build
+++ b/toolkit/components/reputationservice/moz.build
@ -41,3 +41,5 @@ include("/ipc/chromium/chromium-config.mozbuild")

 if CONFIG["ENABLE_TESTS"]:
    DIRS += ["test/gtest"]
+
+REQUIRES_UNIFIED_BUILD = True
--- a/toolkit/components/sessionstore/SessionStoreMessageUtils.h
+++ b/toolkit/components/sessionstore/SessionStoreMessageUtils.h
@ -7,7 +7,6 @@

 #include "ipc/IPCMessageUtils.h"
 #include "mozilla/ipc/IPDLParamTraits.h"
-#include "mozilla/ipc/URIUtils.h"
 #include "SessionStoreData.h"
 #include "SessionStoreUtils.h"
 #include "SessionStoreRestoreData.h"
--- a/toolkit/components/sessionstore/SessionStoreRestoreData.cpp
+++ b/toolkit/components/sessionstore/SessionStoreRestoreData.cpp
@ -4,17 +4,14 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

-#include "mozilla/dom/BrowsingContext.h"
-#include "mozilla/dom/Document.h"
-#include "mozilla/dom/SessionStoreUtils.h"
-#include "mozilla/dom/sessionstore/SessionStoreTypes.h"
-#include "mozilla/dom/WindowContext.h"
-#include "nsISessionStoreRestoreData.h"
-#include "nsNetUtil.h"
-
 namespace mozilla {
 namespace dom {

+#include "mozilla/dom/BrowsingContext.h"
+#include "mozilla/dom/SessionStoreUtils.h"
+#include "mozilla/dom/sessionstore/SessionStoreTypes.h"
+#include "nsISessionStoreRestoreData.h"
+
 bool SessionStoreRestoreData::IsEmpty() {
  return (!mURI && mScroll.IsEmpty() && mInnerHTML.IsEmpty() &&
          mEntries.IsEmpty() && mChildren.IsEmpty());
--- a/toolkit/components/sessionstore/SessionStoreUtils.cpp
+++ b/toolkit/components/sessionstore/SessionStoreUtils.cpp
@ -9,7 +9,6 @@
 #include "js/PropertyAndElement.h"  // JS_GetElement
 #include "js/TypeDecls.h"
 #include "jsapi.h"
-#include "mozilla/BasePrincipal.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/dom/AutocompleteInfoBinding.h"
 #include "mozilla/dom/CanonicalBrowsingContext.h"
--- a/toolkit/components/sessionstore/moz.build
+++ b/toolkit/components/sessionstore/moz.build
@ -53,3 +53,5 @@ FINAL_LIBRARY = "xul"

 with Files("**"):
    BUG_COMPONENT = ("Firefox", "Session Restore")
+
+REQUIRES_UNIFIED_BUILD = True
--- a/toolkit/components/telemetry/tests/gtest/moz.build
+++ b/toolkit/components/telemetry/tests/gtest/moz.build
@ -27,3 +27,5 @@ if CONFIG["OS_TARGET"] != "Android":
 FINAL_LIBRARY = "xul-gtest"

 include("/ipc/chromium/chromium-config.mozbuild")
+
+REQUIRES_UNIFIED_BUILD = True
--- a/toolkit/components/url-classifier/RiceDeltaDecoder.h
+++ b/toolkit/components/url-classifier/RiceDeltaDecoder.h
@ -5,9 +5,6 @@
 #ifndef RICE_DELTA_DECODER_H
 #define RICE_DELTA_DECODER_H

-#include <cstddef>
-#include <cstdint>
-
 namespace mozilla {
 namespace safebrowsing {

--- a/toolkit/components/windowwatcher/moz.build
+++ b/toolkit/components/windowwatcher/moz.build
@ -43,3 +43,5 @@ LOCAL_INCLUDES += [
 ]

 include("/ipc/chromium/chromium-config.mozbuild")
+
+REQUIRES_UNIFIED_BUILD = True
--- a/toolkit/components/windowwatcher/nsOpenWindowInfo.cpp
+++ b/toolkit/components/windowwatcher/nsOpenWindowInfo.cpp
@ -44,11 +44,11 @@ NS_IMETHODIMP nsOpenWindowInfo::GetScriptableOriginAttributes(
  return NS_OK;
 }

-const mozilla::OriginAttributes& nsOpenWindowInfo::GetOriginAttributes() {
+const OriginAttributes& nsOpenWindowInfo::GetOriginAttributes() {
  return mOriginAttributes;
 }

-mozilla::dom::BrowserParent* nsOpenWindowInfo::GetNextRemoteBrowser() {
+BrowserParent* nsOpenWindowInfo::GetNextRemoteBrowser() {
  return mNextRemoteBrowser;
 }

@ -61,8 +61,7 @@ NS_IMPL_ISUPPORTS(nsBrowsingContextReadyCallback,
                  nsIBrowsingContextReadyCallback)

 nsBrowsingContextReadyCallback::nsBrowsingContextReadyCallback(
-    RefPtr<mozilla::dom::BrowsingContextCallbackReceivedPromise::Private>
-        aPromise)
+    RefPtr<BrowsingContextCallbackReceivedPromise::Private> aPromise)
    : mPromise(std::move(aPromise)) {}

 nsBrowsingContextReadyCallback::~nsBrowsingContextReadyCallback() {
@ -73,7 +72,7 @@ nsBrowsingContextReadyCallback::~nsBrowsingContextReadyCallback() {
 }

 NS_IMETHODIMP nsBrowsingContextReadyCallback::BrowsingContextReady(
-    mozilla::dom::BrowsingContext* aBC) {
+    BrowsingContext* aBC) {
  MOZ_DIAGNOSTIC_ASSERT(mPromise,
                        "The 'browsing context ready' callback is null");
  if (!mPromise) {
--- a/toolkit/mozapps/extensions/AddonManagerStartup.cpp
+++ b/toolkit/mozapps/extensions/AddonManagerStartup.cpp
@ -27,7 +27,6 @@
 #include "mozilla/URLPreloader.h"
 #include "mozilla/Unused.h"
 #include "mozilla/ErrorResult.h"
-#include "mozilla/Services.h"
 #include "mozilla/dom/ipc/StructuredCloneData.h"

 #include "nsAppDirectoryServiceDefs.h"
@ -42,7 +41,6 @@
 #include "nsIZipReader.h"
 #include "nsJARProtocolHandler.h"
 #include "nsJSUtils.h"
-#include "nsIObserverService.h"
 #include "nsReadableUtils.h"
 #include "nsXULAppAPI.h"

--- a/toolkit/mozapps/extensions/AddonManagerWebAPI.cpp
+++ b/toolkit/mozapps/extensions/AddonManagerWebAPI.cpp
@ -7,7 +7,6 @@
 #include "AddonManagerWebAPI.h"

 #include "mozilla/BasePrincipal.h"
-#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Navigator.h"
 #include "mozilla/dom/NavigatorBinding.h"

--- a/toolkit/mozapps/extensions/moz.build
+++ b/toolkit/mozapps/extensions/moz.build
@ -99,3 +99,5 @@ with Files("Blocklist.jsm"):

 with Files("content/blocklist**"):
    BUG_COMPONENT = ("Toolkit", "Blocklist Implementation")
+
+REQUIRES_UNIFIED_BUILD = True
--- a/uriloader/exthandler/HandlerServiceParent.cpp
+++ b/uriloader/exthandler/HandlerServiceParent.cpp
@ -9,14 +9,8 @@
 #include "HandlerServiceParent.h"
 #include "nsIHandlerService.h"
 #include "nsIMIMEInfo.h"
-#include "nsIMIMEService.h"
 #include "ContentHandlerService.h"
-#include "nsIExternalProtocolService.h"
 #include "nsStringEnumerator.h"
-#include "nsIMutableArray.h"
-#include "nsCExternalHandlerService.h"
-#include "nsComponentManagerUtils.h"
-#include "nsServiceManagerUtils.h"
 #ifdef MOZ_WIDGET_GTK
 #  include "unix/nsGNOMERegistry.h"
 #endif
--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
@ -142,3 +142,5 @@ if CONFIG["MOZ_ENABLE_DBUS"]:
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
    CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]
+
+REQUIRES_UNIFIED_BUILD = True
--- a/uriloader/exthandler/nsExternalProtocolHandler.cpp
+++ b/uriloader/exthandler/nsExternalProtocolHandler.cpp
@ -16,7 +16,6 @@
 #include "nsServiceManagerUtils.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
-#include "nsIRedirectHistoryEntry.h"
 #include "nsNetUtil.h"
 #include "nsContentSecurityManager.h"
 #include "nsExternalHelperAppService.h"
--- a/uriloader/exthandler/nsLocalHandlerApp.cpp
+++ b/uriloader/exthandler/nsLocalHandlerApp.cpp
@ -7,7 +7,6 @@
 #include "nsLocalHandlerApp.h"
 #include "nsIURI.h"
 #include "nsIProcess.h"
-#include "nsComponentManagerUtils.h"

 // XXX why does nsMIMEInfoImpl have a threadsafe nsISupports?  do we need one
 // here too?
--- a/uriloader/exthandler/nsMIMEInfoImpl.cpp
+++ b/uriloader/exthandler/nsMIMEInfoImpl.cpp
@ -11,20 +11,15 @@
 #include "nsIFile.h"
 #include "nsIFileURL.h"
 #include "nsEscape.h"
-#include "nsComponentManagerUtils.h"
 #include "nsCURILoader.h"
 #include "nsCExternalHandlerService.h"
 #include "nsIExternalProtocolService.h"
 #include "nsIObserverService.h"
-#include "nsISupportsPrimitives.h"
-#include "mozilla/ClearOnShutdown.h"
-#include "mozilla/Services.h"
 #include "mozilla/StaticPtr.h"
-#include "mozilla/StaticPrefs_browser.h"
 #include "xpcpublic.h"

 static bool sInitializedOurData = false;
-mozilla::StaticRefPtr<nsIFile> sOurAppFile;
+StaticRefPtr<nsIFile> sOurAppFile;

 /* static */
 already_AddRefed<nsIFile> nsMIMEInfoBase::GetCanonicalExecutable(
@ -85,14 +80,14 @@ nsMIMEInfoBase::nsMIMEInfoBase(const char* aMIMEType)
    : mSchemeOrType(aMIMEType),
      mClass(eMIMEInfo),
      mAlwaysAskBeforeHandling(
-          mozilla::StaticPrefs::
+          StaticPrefs::
              browser_download_always_ask_before_handling_new_types()) {}

 nsMIMEInfoBase::nsMIMEInfoBase(const nsACString& aMIMEType)
    : mSchemeOrType(aMIMEType),
      mClass(eMIMEInfo),
      mAlwaysAskBeforeHandling(
-          mozilla::StaticPrefs::
+          StaticPrefs::
              browser_download_always_ask_before_handling_new_types()) {}

 // Constructor for a handler that lets the caller specify whether this is a
@ -104,7 +99,7 @@ nsMIMEInfoBase::nsMIMEInfoBase(const nsACString& aType, HandlerClass aClass)
    : mSchemeOrType(aType),
      mClass(aClass),
      mAlwaysAskBeforeHandling(
-          mozilla::StaticPrefs::
+          StaticPrefs::
              browser_download_always_ask_before_handling_new_types() ||
          aClass != eMIMEInfo) {}

@ -357,8 +352,7 @@ bool nsMIMEInfoBase::AutomationOnlyCheckIfLaunchStubbed(nsIFile* aFile) {
 }

 NS_IMETHODIMP
-nsMIMEInfoBase::LaunchWithURI(nsIURI* aURI,
-                              mozilla::dom::BrowsingContext* aBrowsingContext) {
+nsMIMEInfoBase::LaunchWithURI(nsIURI* aURI, BrowsingContext* aBrowsingContext) {
  // This is only being called with protocol handlers
  NS_ASSERTION(mClass == eProtocolInfo,
               "nsMIMEInfoBase should be a protocol handler");
--- a/uriloader/exthandler/win/nsMIMEInfoWin.cpp
+++ b/uriloader/exthandler/win/nsMIMEInfoWin.cpp
@ -5,11 +5,9 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsArrayEnumerator.h"
-#include "nsComponentManagerUtils.h"
 #include "nsCOMArray.h"
 #include "nsLocalFile.h"
 #include "nsMIMEInfoWin.h"
-#include "nsIMIMEService.h"
 #include "nsNetUtil.h"
 #include <windows.h>
 #include <shellapi.h>
@ -100,8 +98,7 @@ nsMIMEInfoWin::LaunchWithFile(nsIFile* aFile) {

  if (mPreferredAction == useSystemDefault) {
    nsCOMPtr<nsIFile> defaultApp = GetDefaultApplication();
-    if (defaultApp &&
-        mozilla::StaticPrefs::browser_pdf_launchDefaultEdgeAsApp()) {
+    if (defaultApp && StaticPrefs::browser_pdf_launchDefaultEdgeAsApp()) {
      // Since Edgium is the default handler for PDF and other kinds of files,
      // if we're using the OS default and it's Edgium prefer its app mode so it
      // operates as a viewer (without browser toolbars). Bug 1632277.
@ -298,8 +295,7 @@ nsresult nsMIMEInfoWin::LoadUriInternal(nsIURI* aURL) {
    // Ask the shell/urlmon to parse |utf16Spec| to avoid malformed URLs.
    // Failure is indicative of a potential security issue so we should
    // bail out if so.
-    mozilla::LauncherResult<_bstr_t> validatedUri =
-        mozilla::UrlmonValidateUri(utf16Spec.get());
+    LauncherResult<_bstr_t> validatedUri = UrlmonValidateUri(utf16Spec.get());
    if (validatedUri.isErr()) {
      return NS_ERROR_FAILURE;
    }
--- a/widget/GfxInfoBase.cpp
+++ b/widget/GfxInfoBase.cpp
@ -36,8 +36,6 @@
 #include "mozilla/widget/ScreenManager.h"
 #include "mozilla/widget/Screen.h"

-#include "jsapi.h"
-
 #include "gfxPlatform.h"
 #include "gfxConfig.h"
 #include "DriverCrashGuard.h"
--- a/widget/PuppetWidget.cpp
+++ b/widget/PuppetWidget.cpp
@ -1137,6 +1137,8 @@ PuppetWidget::NotifyIME(TextEventDispatcher* aTextEventDispatcher,
    default:
      return NS_ERROR_NOT_IMPLEMENTED;
  }
+
+  return NS_ERROR_NOT_IMPLEMENTED;
 }

 NS_IMETHODIMP_(IMENotificationRequests)
--- a/widget/VsyncDispatcher.cpp
+++ b/widget/VsyncDispatcher.cpp
@ -238,7 +238,7 @@ void VsyncDispatcher::RemoveMainThreadObserver(VsyncObserver* aObserver) {
 void VsyncDispatcher::UpdateVsyncStatus() {
  bool wasObservingVsync = false;
  bool needVsync = false;
-  RefPtr<gfx::VsyncSource> vsyncSource;
+  RefPtr<VsyncSource> vsyncSource;

  {
    auto state = mState.Lock();
--- a/widget/WidgetEventImpl.cpp
+++ b/widget/WidgetEventImpl.cpp
@ -28,8 +28,6 @@
 #include "nsPrintfCString.h"

 #if defined(XP_WIN)
-#  include "windef.h"
-#  include "winnetwk.h"
 #  include "npapi.h"
 #  include "WinUtils.h"
 #endif  // #if defined (XP_WIN)
--- a/widget/android/jni/moz.build
+++ b/widget/android/jni/moz.build
@ -33,3 +33,5 @@ LOCAL_INCLUDES += [
    "/widget",
    "/widget/android",
 ]
+
+REQUIRES_UNIFIED_BUILD = True
--- a/widget/android/moz.build
+++ b/widget/android/moz.build
@ -201,3 +201,5 @@ if CONFIG["MOZ_NATIVE_DEVICES"]:
    DEFINES["MOZ_NATIVE_DEVICES"] = True

 # DEFINES['DEBUG_WIDGETS'] = True
+
+REQUIRES_UNIFIED_BUILD = True
--- a/widget/cocoa/moz.build
+++ b/widget/cocoa/moz.build
@ -180,3 +180,5 @@ OS_LIBS += [
 ]

 SPHINX_TREES["/widget/cocoa"] = "docs"
+
+REQUIRES_UNIFIED_BUILD = True
--- a/widget/cocoa/nsCursorManager.mm
+++ b/widget/cocoa/nsCursorManager.mm
@ -72,6 +72,7 @@ static constexpr nsCursor kCustomCursor = eCursorCount;
  NS_OBJC_BEGIN_TRY_BLOCK_RETURN;

  switch (aCursor) {
+    SEL cursorSelector;
    case eCursor_standard:
      return [nsMacCursor cursorWithCursor:[NSCursor arrowCursor] type:aCursor];
    case eCursor_wait:
@ -88,27 +89,24 @@ static constexpr nsCursor kCustomCursor = eCursorCount;
      return [nsMacCursor cursorWithImageNamed:@"move" hotSpot:NSMakePoint(12, 12) type:aCursor];
    case eCursor_help:
      return [nsMacCursor cursorWithImageNamed:@"help" hotSpot:NSMakePoint(12, 12) type:aCursor];
-    case eCursor_copy: {
-      SEL cursorSelector = @selector(dragCopyCursor);
+    case eCursor_copy:
+      cursorSelector = @selector(dragCopyCursor);
      return [nsMacCursor cursorWithCursor:[NSCursor respondsToSelector:cursorSelector]
                                               ? [NSCursor performSelector:cursorSelector]
                                               : [NSCursor arrowCursor]
                                      type:aCursor];
-    }
-    case eCursor_alias: {
-      SEL cursorSelector = @selector(dragLinkCursor);
+    case eCursor_alias:
+      cursorSelector = @selector(dragLinkCursor);
      return [nsMacCursor cursorWithCursor:[NSCursor respondsToSelector:cursorSelector]
                                               ? [NSCursor performSelector:cursorSelector]
                                               : [NSCursor arrowCursor]
                                      type:aCursor];
-    }
-    case eCursor_context_menu: {
-      SEL cursorSelector = @selector(contextualMenuCursor);
+    case eCursor_context_menu:
+      cursorSelector = @selector(contextualMenuCursor);
      return [nsMacCursor cursorWithCursor:[NSCursor respondsToSelector:cursorSelector]
                                               ? [NSCursor performSelector:cursorSelector]
                                               : [NSCursor arrowCursor]
                                      type:aCursor];
-    }
    case eCursor_cell:
      return [nsMacCursor cursorWithImageNamed:@"cell" hotSpot:NSMakePoint(12, 12) type:aCursor];
    case eCursor_grab:
@ -124,13 +122,12 @@ static constexpr nsCursor kCustomCursor = eCursorCount;
    case eCursor_all_scroll:
      return [nsMacCursor cursorWithCursor:[NSCursor openHandCursor] type:aCursor];
    case eCursor_not_allowed:
-    case eCursor_no_drop: {
-      SEL cursorSelector = @selector(operationNotAllowedCursor);
+    case eCursor_no_drop:
+      cursorSelector = @selector(operationNotAllowedCursor);
      return [nsMacCursor cursorWithCursor:[NSCursor respondsToSelector:cursorSelector]
                                               ? [NSCursor performSelector:cursorSelector]
                                               : [NSCursor arrowCursor]
                                      type:aCursor];
-    }
    // Resize Cursors:
    // North
    case eCursor_n_resize:
--- a/widget/cocoa/nsMacUserActivityUpdater.mm
+++ b/widget/cocoa/nsMacUserActivityUpdater.mm
@ -8,7 +8,6 @@

 #include "nsCocoaUtils.h"
 #include "nsIBaseWindow.h"
-#include "gfxPlatform.h"

 NS_IMPL_ISUPPORTS(nsMacUserActivityUpdater, nsIMacUserActivityUpdater)

--- a/widget/cocoa/nsMenuBarX.h
+++ b/widget/cocoa/nsMenuBarX.h
@ -13,12 +13,12 @@

 #include "nsISupports.h"
 #include "nsMenuParentX.h"
+#include "nsMenuGroupOwnerX.h"
 #include "nsChangeObserver.h"
 #include "nsTArray.h"
 #include "nsString.h"

 class nsMenuBarX;
-class nsMenuGroupOwnerX;
 class nsMenuX;
 class nsIWidget;
 class nsIContent;
--- a/widget/cocoa/nsMenuGroupOwnerX.h
+++ b/widget/cocoa/nsMenuGroupOwnerX.h
@ -13,10 +13,10 @@
 #include "nsStubMutationObserver.h"
 #include "nsHashKeys.h"
 #include "nsIObserver.h"
-#include "nsMenuBarX.h"
 #include "nsTHashMap.h"
 #include "nsString.h"

+class nsMenuBarX;
 class nsMenuItemX;
 class nsChangeObserver;
 class nsIWidget;
--- a/widget/cocoa/nsTouchBar.mm
+++ b/widget/cocoa/nsTouchBar.mm
@ -7,7 +7,6 @@
 #include <objc/runtime.h>

 #include "mozilla/MacStringHelpers.h"
-#include "mozilla/dom/Document.h"
 #include "nsArrayUtils.h"
 #include "nsCocoaUtils.h"
 #include "nsDirectoryServiceDefs.h"
--- a/widget/headless/HeadlessWidget.cpp
+++ b/widget/headless/HeadlessWidget.cpp
@ -17,7 +17,6 @@
 #include "mozilla/WritingModes.h"
 #include "mozilla/widget/HeadlessWidgetTypes.h"
 #include "mozilla/widget/PlatformWidgetTypes.h"
-#include "mozilla/widget/Screen.h"
 #include "nsIScreen.h"
 #include "HeadlessKeyBindings.h"

--- a/widget/headless/moz.build
+++ b/widget/headless/moz.build
@ -46,3 +46,5 @@ else:
 include("/ipc/chromium/chromium-config.mozbuild")

 FINAL_LIBRARY = "xul"
+
+REQUIRES_UNIFIED_BUILD = True
--- a/widget/moz.build
+++ b/widget/moz.build
@ -388,3 +388,5 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
 if CONFIG["MOZ_WAYLAND"]:
    CXXFLAGS += CONFIG["MOZ_WAYLAND_CFLAGS"]
+
+REQUIRES_UNIFIED_BUILD = True
--- a/widget/nsIWidget.h
+++ b/widget/nsIWidget.h
@ -9,7 +9,6 @@

 #include <cmath>
 #include <cstdint>
-#include "imgIContainer.h"
 #include "ErrorList.h"
 #include "Units.h"
 #include "mozilla/AlreadyAddRefed.h"
@ -47,6 +46,7 @@
 // forward declarations
 class nsIBidiKeyboard;
 class nsIRollupListener;
+class imgIContainer;
 class nsIContent;
 class ViewWrapper;
 class nsIRunnable;
--- a/widget/nsPrinterListCUPS.cpp
+++ b/widget/nsPrinterListCUPS.cpp
@ -34,7 +34,7 @@ static void GetDisplayNameForPrinter(const cups_dest_t& aDest,
  const char* displayName = CupsShim().cupsGetOption(
      "printer-info", aDest.num_options, aDest.options);
  if (displayName) {
-    CopyUTF8toUTF16(mozilla::MakeStringSpan(displayName), aName);
+    CopyUTF8toUTF16(MakeStringSpan(displayName), aName);
  }
 #endif
 }
--- a/widget/tests/gtest/moz.build
+++ b/widget/tests/gtest/moz.build
@ -25,3 +25,5 @@ LOCAL_INCLUDES += [
 ]

 DisableStlWrapping()
+
+REQUIRES_UNIFIED_BUILD = True
--- a/widget/windows/IMMHandler.h
+++ b/widget/windows/IMMHandler.h
@ -11,10 +11,7 @@
 #include "mozilla/TextEventDispatcher.h"
 #include "mozilla/WritingModes.h"

-#include "windef.h"
-#include "winnetwk.h"
 #include "npapi.h"
-
 #include "nsCOMPtr.h"
 #include "nsIWidget.h"
 #include "nsRect.h"
--- a/widget/windows/InkCollector.cpp
+++ b/widget/windows/InkCollector.cpp
@ -6,14 +6,12 @@
 */

 #include "InkCollector.h"
-#include "nsDebug.h"
-#include "nsISupportsUtils.h"

 // Msinkaut_i.c and Msinkaut.h should both be included
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms695519.aspx
 #include <msinkaut_i.c>

-mozilla::StaticAutoPtr<InkCollector> InkCollector::sInkCollector;
+StaticAutoPtr<InkCollector> InkCollector::sInkCollector;

 InkCollector::~InkCollector() {
  Shutdown();
--- a/widget/windows/InkCollector.h
+++ b/widget/windows/InkCollector.h
@ -8,7 +8,6 @@
 #ifndef InkCollector_h__
 #define InkCollector_h__

-#include <objbase.h>
 #include <msinkaut.h>
 #include "mozilla/StaticPtr.h"

--- a/widget/windows/JumpListItem.cpp
+++ b/widget/windows/JumpListItem.cpp
@ -14,7 +14,6 @@
 #include "nsCRT.h"
 #include "nsNetCID.h"
 #include "nsCExternalHandlerService.h"
-#include "nsComponentManagerUtils.h"
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/Preferences.h"
 #include "JumpListBuilder.h"
--- a/widget/windows/KeyboardLayout.cpp
+++ b/widget/windows/KeyboardLayout.cpp
@ -1398,6 +1398,7 @@ void NativeKey::InitIsSkippableForKeyOrChar(const MSG& aLastKeyMSG) {
          // by the auto-repeat feature.
          return;
      }
+      return;
    case WM_APPCOMMAND:
      MOZ_ASSERT_UNREACHABLE(
          "WM_APPCOMMAND should be handled in "
--- a/widget/windows/RemoteBackbuffer.cpp
+++ b/widget/windows/RemoteBackbuffer.cpp
@ -7,8 +7,6 @@
 #include "GeckoProfiler.h"
 #include "nsThreadUtils.h"
 #include "mozilla/Span.h"
-#include "mozilla/gfx/Point.h"
-#include "WinUtils.h"
 #include <algorithm>
 #include <type_traits>

@ -165,7 +163,7 @@ class SharedImage {

  already_AddRefed<gfx::DrawTarget> CreateDrawTarget() {
    return gfx::Factory::CreateDrawTargetForData(
-        gfx::BackendType::CAIRO, mPixelData, gfx::IntSize(mWidth, mHeight),
+        gfx::BackendType::CAIRO, mPixelData, IntSize(mWidth, mHeight),
        GetStride(), gfx::SurfaceFormat::B8G8R8A8);
  }

@ -289,8 +287,8 @@ class PresentableSharedImage {
          mDeviceContext, &srcPos, 0 /*colorKey*/, &bf, ULW_ALPHA);
    }

-    gfx::IntRect sharedImageRect{0, 0, mSharedImage.GetWidth(),
-                                 mSharedImage.GetHeight()};
+    IntRect sharedImageRect{0, 0, mSharedImage.GetWidth(),
+                            mSharedImage.GetHeight()};

    bool result = true;

@ -300,9 +298,9 @@ class PresentableSharedImage {
    }

    for (auto& ipcDirtyRect : aDirtyRects) {
-      gfx::IntRect dirtyRect{ipcDirtyRect.x, ipcDirtyRect.y, ipcDirtyRect.width,
-                             ipcDirtyRect.height};
-      gfx::IntRect bltRect = dirtyRect.Intersect(sharedImageRect);
+      IntRect dirtyRect{ipcDirtyRect.x, ipcDirtyRect.y, ipcDirtyRect.width,
+                        ipcDirtyRect.height};
+      IntRect bltRect = dirtyRect.Intersect(sharedImageRect);

      if (!::BitBlt(windowDC, bltRect.x /*dstX*/, bltRect.y /*dstY*/,
                    bltRect.width, bltRect.height, mDeviceContext,
--- a/widget/windows/RemoteBackbuffer.h
+++ b/widget/windows/RemoteBackbuffer.h
@ -9,7 +9,6 @@
 #include "nsIWidget.h"
 #include "mozilla/widget/PCompositorWidgetParent.h"
 #include "mozilla/Maybe.h"
-#include "mozilla/gfx/2D.h"
 #include "prthread.h"
 #include <windows.h>

--- a/widget/windows/SystemStatusBar.cpp
+++ b/widget/windows/SystemStatusBar.cpp
@ -24,8 +24,6 @@
 #include "nsDocShell.h"
 #include "nsWindowGfx.h"

-#include "shellapi.h"
-
 namespace mozilla::widget {

 using mozilla::LinkedListElement;
--- a/widget/windows/SystemStatusBar.h
+++ b/widget/windows/SystemStatusBar.h
@ -7,7 +7,6 @@
 #define widget_windows_SystemStatusBar_h

 #include "nsISystemStatusBar.h"
-#include "mozilla/LinkedList.h"

 namespace mozilla::widget {
 class StatusBarEntry;
--- a/widget/windows/TaskbarTabPreview.cpp
+++ b/widget/windows/TaskbarTabPreview.cpp
@ -185,6 +185,7 @@ TaskbarTabPreview::WndProc(UINT nMsg, WPARAM wParam, LPARAM lParam) {
      return wParam == SC_CLOSE
                 ? ::DefWindowProcW(mProxyWindow, WM_SYSCOMMAND, wParam, lParam)
                 : ::SendMessageW(mWnd, WM_SYSCOMMAND, wParam, lParam);
+      return 0;
  }
  return TaskbarPreview::WndProc(nMsg, wParam, lParam);
 }
--- a/widget/windows/WinEventObserver.cpp
+++ b/widget/windows/WinEventObserver.cpp
@ -14,7 +14,6 @@
 #include "mozilla/Logging.h"
 #include "mozilla/StaticPtr.h"
 #include "nsHashtablesFwd.h"
-#include "nsdefs.h"

 namespace mozilla::widget {

--- a/widget/windows/WinPointerEvents.cpp
+++ b/widget/windows/WinPointerEvents.cpp
@ -8,9 +8,7 @@
 */

 #include "nscore.h"
-#include "nsWindowDefs.h"
 #include "WinPointerEvents.h"
-#include "WinUtils.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/WindowsVersion.h"
--- a/widget/windows/WinPointerEvents.h
+++ b/widget/windows/WinPointerEvents.h
@ -7,8 +7,7 @@
 #define WinPointerEvents_h__

 #include "mozilla/MouseEvents.h"
-#include "touchinjection_sdk80.h"
-#include <windef.h>
+#include "nsWindow.h"

 // Define PointerEvent related macros and structures when building code on
 // Windows version before Win8.
--- a/widget/windows/WinUtils.cpp
+++ b/widget/windows/WinUtils.cpp
@ -82,6 +82,10 @@ NS_IMPL_ISUPPORTS(AsyncDeleteAllFaviconsFromDisk, nsIRunnable)
 const char FaviconHelper::kJumpListCacheDir[] = "jumpListCache";
 const char FaviconHelper::kShortcutCacheDir[] = "shortcutCache";

+// Prefix for path used by NT calls.
+const wchar_t kNTPrefix[] = L"\\??\\";
+const size_t kNTPrefixLen = ArrayLength(kNTPrefix) - 1;
+
 struct CoTaskMemFreePolicy {
  void operator()(void* aPtr) { ::CoTaskMemFree(aPtr); }
 };
--- a/widget/windows/WinWindowOcclusionTracker.h
+++ b/widget/windows/WinWindowOcclusionTracker.h
@ -14,13 +14,9 @@

 #include "nsIWeakReferenceUtils.h"
 #include "mozilla/Monitor.h"
-#include "mozilla/StaticPtr.h"
-#include "mozilla/WindowsVersion.h"
 #include "mozilla/ThreadSafeWeakPtr.h"
 #include "mozilla/widget/WindowOcclusionState.h"
 #include "mozilla/widget/WinEventObserver.h"
-#include "Units.h"
-#include "nsThreadUtils.h"

 class nsBaseWidget;
 struct IVirtualDesktopManager;
--- a/widget/windows/WindowsConsole.cpp
+++ b/widget/windows/WindowsConsole.cpp
@ -7,8 +7,6 @@

 #include <windows.h>
 #include <fcntl.h>
-#include <cstdio>
-#include <io.h>

 namespace mozilla {

--- a/widget/windows/moz.build
+++ b/widget/windows/moz.build
@ -202,3 +202,5 @@ if CONFIG["CC_TYPE"] == "clang-cl":
    ]

 SPHINX_TREES["/widget/windows"] = "docs"
+
+REQUIRES_UNIFIED_BUILD = True
--- a/widget/windows/nsAppShell.cpp
+++ b/widget/windows/nsAppShell.cpp
@ -30,7 +30,6 @@
 #include "mozilla/widget/ScreenManager.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/WindowsProcessMitigations.h"
-#include "mozilla/WindowsVersion.h"

 #ifdef MOZ_BACKGROUNDTASKS
 #  include "mozilla/BackgroundTasks.h"
--- a/widget/windows/nsClipboard.cpp
+++ b/widget/windows/nsClipboard.cpp
@ -21,8 +21,6 @@
 #include "mozilla/Logging.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_clipboard.h"
-#include "mozilla/StaticPrefs_widget.h"
-#include "mozilla/WindowsVersion.h"
 #include "SpecialSystemDirectory.h"

 #include "nsArrayUtils.h"
@ -46,7 +44,6 @@
 #include "nsIObserverService.h"
 #include "nsMimeTypes.h"
 #include "imgITools.h"
-#include "imgIContainer.h"

 using mozilla::LogLevel;

@ -301,8 +298,7 @@ nsresult nsClipboard::SetupNativeDataObject(
    }
  }

-  if (!mozilla::StaticPrefs::
-          clipboard_copyPrivateDataToClipboardCloudOrHistory()) {
+  if (!StaticPrefs::clipboard_copyPrivateDataToClipboardCloudOrHistory()) {
    // Let Clipboard know that data is sensitive and must not be copied to
    // the Cloud Clipboard, Clipboard History and similar.
    // https://docs.microsoft.com/en-us/windows/win32/dataxchg/clipboard-formats#cloud-clipboard-and-clipboard-history-formats
@ -487,7 +483,7 @@ NS_IMETHODIMP nsClipboard::SetNativeClipboardData(int32_t aWhichClipboard) {
  }

 #ifdef ACCESSIBILITY
-  mozilla::a11y::Compatibility::SuppressA11yForClipboardCopy();
+  a11y::Compatibility::SuppressA11yForClipboardCopy();
 #endif

  RefPtr<IDataObject> dataObj;
@ -498,7 +494,7 @@ NS_IMETHODIMP nsClipboard::SetNativeClipboardData(int32_t aWhichClipboard) {
    RepeatedlyTryOleSetClipboard(dataObj);

    const bool doFlush = [&] {
-      switch (mozilla::StaticPrefs::widget_windows_sync_clipboard_flush()) {
+      switch (StaticPrefs::widget_windows_sync_clipboard_flush()) {
        case 0:
          return false;
        case 1:
@ -512,7 +508,7 @@ NS_IMETHODIMP nsClipboard::SetNativeClipboardData(int32_t aWhichClipboard) {
          // lesser of the two performance/memory evils here and force immediate
          // rendering.
          return mightNeedToFlush == MightNeedToFlush::Yes &&
-                 mozilla::NeedsWindows11SuggestedActionsWorkaround();
+                 NeedsWindows11SuggestedActionsWorkaround();
      }
    }();
    if (doFlush) {
@ -1405,8 +1401,7 @@ nsresult nsClipboard::SaveStorageOrStream(IDataObject* aDataObject, UINT aIndex,
    return NS_ERROR_FAILURE;
  }

-  auto releaseMediumGuard =
-      mozilla::MakeScopeExit([&] { ReleaseStgMedium(&stm); });
+  auto releaseMediumGuard = MakeScopeExit([&] { ReleaseStgMedium(&stm); });

  // We do this check because, even though we *asked* for IStorage or IStream,
  // it seems that IDataObject providers can just hand us back whatever they
--- a/widget/windows/nsNativeDragSource.cpp
+++ b/widget/windows/nsNativeDragSource.cpp
@ -10,7 +10,6 @@
 #include "nsToolkit.h"
 #include "nsWidgetsCID.h"
 #include "nsIDragService.h"
-#include "nsServiceManagerUtils.h"
 #include "mozilla/dom/DataTransfer.h"

 /*
--- a/widget/windows/nsPrintDialogWin.cpp
+++ b/widget/windows/nsPrintDialogWin.cpp
@ -6,7 +6,6 @@
 #include "nsPrintDialogWin.h"

 #include "nsArray.h"
-#include "nsComponentManagerUtils.h"
 #include "nsCOMPtr.h"
 #include "nsIBaseWindow.h"
 #include "nsIBrowserChild.h"
@ -19,7 +18,6 @@
 #include "nsPrintDialogUtil.h"
 #include "nsIPrintSettings.h"
 #include "nsIWebBrowserChrome.h"
-#include "nsServiceManagerUtils.h"
 #include "nsPIDOMWindow.h"
 #include "nsQueryObject.h"

--- a/widget/windows/nsPrintDialogWin.h
+++ b/widget/windows/nsPrintDialogWin.h
@ -11,8 +11,6 @@
 #include "nsCOMPtr.h"
 #include "nsIWindowWatcher.h"

-#include <windef.h>
-
 class nsIPrintSettings;
 class nsIDialogParamBlock;

--- a/widget/windows/nsPrintSettingsServiceWin.cpp
+++ b/widget/windows/nsPrintSettingsServiceWin.cpp
@ -13,8 +13,8 @@
 #include "nsIServiceManager.h"
 #include "nsWindowsHelpers.h"
 #include "ipc/IPCMessageUtils.h"
-#include "chrome/common/ipc_channel.h"
-#include "mozilla/embedding/PPrintingTypes.h"
+
+const char kPrinterListContractID[] = "@mozilla.org/gfx/printerlist;1";

 using namespace mozilla::embedding;

--- a/widget/windows/nsSound.cpp
+++ b/widget/windows/nsSound.cpp
@ -32,9 +32,7 @@

 using mozilla::LogLevel;

-#ifdef DEBUG
 static mozilla::LazyLogModule gWin32SoundLog("nsSound");
-#endif

 // Hackaround for bug 1644240
 // When we call PlaySound for the first time in the process, winmm.dll creates
--- a/widget/windows/nsWindowDbg.cpp
+++ b/widget/windows/nsWindowDbg.cpp
@ -8,16 +8,12 @@
 */

 #include "nsWindowDbg.h"
-#include "nsToolkit.h"
-#include "WinPointerEvents.h"
 #include "nsWindowLoggedMessages.h"
 #include "mozilla/Logging.h"
 #include "mozilla/Maybe.h"
 #include <winuser.h>
 #include <dbt.h>
 #include <imm.h>
-#include <tpcshrd.h>
-
 #include <unordered_set>

 using namespace mozilla;
--- a/widget/windows/nsWindowGfx.cpp
+++ b/widget/windows/nsWindowGfx.cpp
@ -25,7 +25,6 @@
 #include "gfxEnv.h"
 #include "gfxImageSurface.h"
 #include "gfxUtils.h"
-#include "gfxConfig.h"
 #include "gfxWindowsSurface.h"
 #include "gfxWindowsPlatform.h"
 #include "gfxDWriteFonts.h"
@ -41,8 +40,6 @@
 #include "nsIWidgetListener.h"
 #include "mozilla/Unused.h"
 #include "nsDebug.h"
-#include "WindowRenderer.h"
-#include "mozilla/layers/WebRenderLayerManager.h"

 #include "mozilla/gfx/GPUProcessManager.h"
 #include "mozilla/layers/CompositorBridgeParent.h"
@ -75,6 +72,9 @@ extern mozilla::LazyLogModule gWindowsLog;
 *
 **************************************************************/

+static UniquePtr<uint8_t[]> sSharedSurfaceData;
+static IntSize sSharedSurfaceSize;
+
 struct IconMetrics {
  int32_t xMetric;
  int32_t yMetric;
--- a/widget/windows/nsWindowLoggedMessages.cpp
+++ b/widget/windows/nsWindowLoggedMessages.cpp
@ -3,10 +3,8 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

-#include <windef.h>
 #include <winuser.h>
 #include "mozilla/StaticPrefs_storage.h"
-#include "mozilla/StaticPrefs_widget.h"
 #include "nsWindowLoggedMessages.h"
 #include "nsWindow.h"
 #include "WinUtils.h"
--- a/xpcom/base/nsISupportsUtils.h
+++ b/xpcom/base/nsISupportsUtils.h
@ -10,7 +10,6 @@
 #include <type_traits>

 #include "nscore.h"
-#include "nsIOutputStream.h"
 #include "nsISupports.h"
 #include "nsError.h"
 #include "nsDebug.h"