tor-browser

The Tor Browser
git clone https://git.dasho.dev/tor-browser.git
Log | Files | Refs | README | LICENSE
commit 17287b2ae8ef7d3fc67c37fe186900b1d2b98284
parent 24531c8fa553c4e491c591313771b0b80b96fccb
Author: Cristina Horotan <chorotan@mozilla.com>
Date:   Sat, 15 Nov 2025 19:01:28 +0200

Revert "Bug 1995522 - Cleanup remaining unused mfbt includes r=emilio,necko-reviewers,media-playback-reviewers,webrtc-reviewers,profiler-reviewers,toolkit-telemetry-reviewers,firefox-style-system-reviewers,layout-reviewers,dom-worker-reviewers,emz,mstange,TYLin,alwu,pehrsons,dom-storage-reviewers,valentin,jari,jwatt,hsingh,edenchuang,janv" for causing conflict on reverting Bug 1998267

This reverts commit d0eaaff18d274fea2a1057b004e53ff0baab0f63.

Diffstat:

Mdom/ipc/MemMapSnapshot.h | 1+


Mdom/localstorage/ActorsParent.cpp | 1+


Mdom/localstorage/LSValue.cpp | 1-


Mdom/localstorage/LSValue.h | 1+


Mdom/media/MediaDecoderStateMachine.cpp | 1+


Mdom/media/MediaTrackGraphImpl.h | 1+


Mdom/media/mediacontrol/tests/gtest/TestMediaKeysEventMac.mm | 1+


Mdom/media/mp4/DecoderData.h | 1+


Mdom/media/platforms/agnostic/bytestreams/H265.cpp | 1+


Mdom/navigation/NavigationPrecommitController.h | 1+


Mdom/quota/ActorsParent.cpp | 2++


Mdom/quota/QuotaManagerService.cpp | 1+


Mdom/quota/nsIndexedDBProtocolHandler.cpp | 1+


Mdom/script/AutoEntryScript.cpp | 1+


Mdom/script/ScriptLoadContext.h | 4++++


Mdom/serviceworkers/ServiceWorkerRegistrar.cpp | 1+


Mdom/simpledb/SDBConnection.cpp | 2++


Mdom/simpledb/SDBResults.cpp | 1+


Mdom/url/URLSearchParams.cpp | 1+


Mdom/workers/ScriptLoader.cpp | 1+


Mdom/workers/WorkerError.cpp | 1+


Mgfx/2d/DataSurfaceHelpers.cpp | 1+


Mgfx/ipc/GPUParent.cpp | 1+


Mgfx/layers/SurfacePool.h | 2++


Mgfx/layers/ipc/CompositorBridgeParent.cpp | 1+


Mgfx/layers/wr/WebRenderBridgeParent.h | 1+


Mgfx/thebes/gfxFont.cpp | 1+


Mgfx/thebes/gfxFontEntry.cpp | 1+


Mgfx/vr/gfxVR.h | 1+


Mimage/Image.h | 1+


Mimage/RasterImage.cpp | 1+


Mintl/components/src/DateTimeFormat.h | 2++


Mintl/components/src/NumberFormat.h | 1+


Mintl/components/src/PluralRules.cpp | 1+


Mipc/chromium/src/chrome/common/ipc_channel_posix.cc | 1+


Mipc/chromium/src/chrome/common/ipc_channel_win.cc | 1+


Mipc/glue/IdleSchedulerParent.h | 1+


Mipc/glue/MessageChannel.cpp | 1+


Mipc/glue/ProcessUtils.h | 1+


Mipc/glue/SerializedStructuredCloneBuffer.h | 2++


Mjs/loader/ScriptLoadRequest.h | 2++


Mjs/src/builtin/intl/Segmenter.cpp | 1+


Mjs/src/builtin/temporal/TimeZone.cpp | 1+


Mjs/src/debugger/DebuggerMemory.cpp | 2++


Mjs/src/ds/Bitmap.h | 1+


Mjs/src/gc/Nursery.cpp | 1+


Mjs/src/jit/JitcodeMap.cpp | 1+


Mjs/src/jit/mips64/Simulator-mips64.cpp | 1+


Mjs/src/jit/riscv64/Simulator-riscv64.cpp | 2++


Mjs/src/jsapi.h | 3+++


Mjs/src/threading/Mutex.h | 1+


Mjs/src/vm/ErrorReporting.cpp | 2--


Mjs/src/wasm/WasmCode.h | 1+


Mjs/src/wasm/WasmCodegenTypes.cpp | 1-


Mjs/xpconnect/loader/URLPreloader.h | 1+


Mjs/xpconnect/src/XPCJSContext.cpp | 1+


Mlayout/base/AnchorPositioningUtils.h | 1+


Mlayout/base/nsCSSFrameConstructor.cpp | 1+


Mlayout/generic/ScrollContainerFrame.h | 1+


Mlayout/painting/nsCSSRendering.cpp | 1+


Mlayout/painting/nsDisplayList.cpp | 1+


Mlayout/style/ServoStyleConstsForwards.h | 2++


Mlayout/style/ServoStyleConstsInlines.h | 1-


Mlayout/style/StyleAnimationValue.cpp | 1+


Mlayout/style/nsCSSValue.cpp | 1+


Mmedia/webrtc/signaling/gtest/jsep_session_unittest.cpp | 1+


Mmemory/build/Globals.h | 1+


Mmfbt/tests/gtest/TestTainting.cpp | 1+


Mmodules/libpref/SharedPrefMap.h | 1+


Mnetwerk/dns/nsDNSService2.cpp | 1+


Mnetwerk/dns/nsEffectiveTLDService.cpp | 3+++


Mnetwerk/dns/nsIDNService.cpp | 1+


Mnetwerk/protocol/http/nsHttpChannel.cpp | 1+


Mparser/html/nsHtml5Portability.cpp | 1+


Mparser/html/nsHtml5TreeBuilder.h | 1+


Msecurity/certverifier/NSSCertDBTrustDomain.cpp | 1+


Msecurity/manager/ssl/nsNSSCertHelper.cpp | 1+


Msecurity/manager/ssl/nsNSSCertificate.cpp | 2++


Msecurity/manager/ssl/nsNSSComponent.cpp | 2++


Msecurity/sandbox/linux/Sandbox.cpp | 1+


Mstartupcache/test/TestStartupCache.cpp | 1+


Mtesting/gtest/mozilla/gmock-custom/gmock-matchers.h | 1+


Mtoolkit/components/antitracking/ContentBlockingLog.cpp | 2++


Mtoolkit/components/backgroundhangmonitor/HangAnnotations.h | 1+


Mtoolkit/components/extensions/MatchPattern.h | 1+


Mtoolkit/components/glean/tests/gtest/TestFog.cpp | 1+


Mtoolkit/components/ml/backends/llama/LlamaBackend.cpp | 1+


Mtoolkit/components/ml/backends/llama/LlamaBackend.h | 1-


Mtoolkit/components/ml/backends/llama/LlamaRunner.h | 1+


Mtoolkit/components/remote/nsDBusRemoteClient.h | 1+


Mtoolkit/components/resistfingerprinting/nsRFPService.cpp | 2++


Mtoolkit/components/sessionstore/BrowserSessionStore.cpp | 2++


Mtoolkit/components/sessionstore/SessionStoreFormData.cpp | 1+


Mtoolkit/components/sessionstore/SessionStoreParent.cpp | 1+


Mtoolkit/components/sessionstore/SessionStoreScrollData.cpp | 1+


Mtoolkit/components/telemetry/core/Telemetry.cpp | 1+


Mtoolkit/library/nsDllMain.cpp | 1+


Mtoolkit/mozapps/defaultagent/Policy.cpp | 1+


Mtoolkit/xre/AutoSQLiteLifetime.cpp | 1+


Mtoolkit/xre/nsAppRunner.cpp | 2++


Mtools/profiler/public/GeckoProfiler.h | 1+


Mtools/profiler/public/ProfilerLabels.h | 1+


Muriloader/preload/PreloadService.cpp | 1+


Mview/nsView.cpp | 2++


Mwidget/ClipboardContentAnalysisParent.cpp | 1+


Mxpcom/base/MacStringHelpers.mm | 1+


Mxpcom/base/nsMemoryReporterManager.cpp | 1+


107 files changed, 125 insertions(+), 6 deletions(-)

diff --git a/dom/ipc/MemMapSnapshot.h b/dom/ipc/MemMapSnapshot.h
@@ -9,6 +9,7 @@
 
 #include "ErrorList.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/RangedPtr.h"
 #include "mozilla/Result.h"
 #include "mozilla/ipc/SharedMemoryMapping.h"
diff --git a/dom/localstorage/ActorsParent.cpp b/dom/localstorage/ActorsParent.cpp
@@ -36,6 +36,7 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/GeckoTrace.h"
 #include "mozilla/Logging.h"
+#include "mozilla/MacroForEach.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/Mutex.h"
diff --git a/dom/localstorage/LSValue.cpp b/dom/localstorage/LSValue.cpp
@@ -7,7 +7,6 @@
 #include "mozilla/dom/LSValue.h"
 
 #include "mozIStorageStatement.h"
-#include "mozilla/Assertions.h"
 #include "mozilla/TextUtils.h"
 #include "mozilla/dom/SnappyUtils.h"
 #include "mozilla/fallible.h"
diff --git a/dom/localstorage/LSValue.h b/dom/localstorage/LSValue.h
@@ -11,6 +11,7 @@
 
 #include "ErrorList.h"
 #include "SnappyUtils.h"
+#include "mozilla/Assertions.h"
 #include "nsString.h"
 #include "nsStringFwd.h"
 #include "nsTStringRepr.h"
diff --git a/dom/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp
@@ -28,6 +28,7 @@
 #include "mediasink/DecodedStream.h"
 #include "mediasink/VideoSink.h"
 #include "mozilla/Logging.h"
+#include "mozilla/MathAlgorithms.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/ProfilerLabels.h"
 #include "mozilla/ProfilerMarkerTypes.h"
diff --git a/dom/media/MediaTrackGraphImpl.h b/dom/media/MediaTrackGraphImpl.h
@@ -15,6 +15,7 @@
 #include "MediaEventSource.h"
 #include "MediaTrackGraph.h"
 #include "mozilla/Atomics.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtr.h"
diff --git a/dom/media/mediacontrol/tests/gtest/TestMediaKeysEventMac.mm b/dom/media/mediacontrol/tests/gtest/TestMediaKeysEventMac.mm
@@ -11,6 +11,7 @@
 #include "MediaHardwareKeysEventSourceMac.h"
 #include "MediaKeyListenerTest.h"
 #include "gtest/gtest.h"
+#include "mozilla/Maybe.h"
 
 using namespace mozilla::dom;
 using namespace mozilla::widget;
diff --git a/dom/media/mp4/DecoderData.h b/dom/media/mp4/DecoderData.h
@@ -7,6 +7,7 @@
 
 #include "MediaInfo.h"
 #include "MediaResult.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/Result.h"
 #include "mp4parse.h"
 #include "nsString.h"
diff --git a/dom/media/platforms/agnostic/bytestreams/H265.cpp b/dom/media/platforms/agnostic/bytestreams/H265.cpp
@@ -16,6 +16,7 @@
 #include "ByteWriter.h"
 #include "MediaData.h"
 #include "MediaInfo.h"
+#include "mozilla/PodOperations.h"
 #include "mozilla/Span.h"
 #include "nsFmtString.h"
 
diff --git a/dom/navigation/NavigationPrecommitController.h b/dom/navigation/NavigationPrecommitController.h
@@ -8,6 +8,7 @@
 #define DOM_NAVIGATIONPRECOMMITCONTROLLER_H_
 
 #include "js/TypeDecls.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "nsCycleCollectionParticipant.h"
diff --git a/dom/quota/ActorsParent.cpp b/dom/quota/ActorsParent.cpp
@@ -64,6 +64,7 @@
 #include "mozilla/GeckoTrace.h"
 #include "mozilla/InitializedOnce.h"
 #include "mozilla/Logging.h"
+#include "mozilla/MacroForEach.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/NotNull.h"
@@ -79,6 +80,7 @@
 #include "mozilla/StaticPtr.h"
 #include "mozilla/StorageOriginAttributes.h"
 #include "mozilla/SystemPrincipal.h"
+#include "mozilla/TextUtils.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/dom/FileSystemQuotaClientFactory.h"
 #include "mozilla/dom/FlippedOnce.h"
diff --git a/dom/quota/QuotaManagerService.cpp b/dom/quota/QuotaManagerService.cpp
@@ -23,6 +23,7 @@
 #include "mozilla/Atomics.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/Hal.h"
+#include "mozilla/MacroForEach.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/OriginAttributes.h"
 #include "mozilla/RefPtr.h"
diff --git a/dom/quota/nsIndexedDBProtocolHandler.cpp b/dom/quota/nsIndexedDBProtocolHandler.cpp
@@ -10,6 +10,7 @@
 #include <cstdint>
 
 #include "ErrorList.h"
+#include "mozilla/Assertions.h"
 #include "nsIWeakReference.h"
 #include "nsStandardURL.h"
 #include "nsStringFwd.h"
diff --git a/dom/script/AutoEntryScript.cpp b/dom/script/AutoEntryScript.cpp
@@ -12,6 +12,7 @@
 #include "js/ProfilingStack.h"
 #include "jsapi.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/Maybe.h"
 #include "nsCOMPtr.h"
 #include "nsContentUtils.h"
 #include "nsGlobalWindowInner.h"
diff --git a/dom/script/ScriptLoadContext.h b/dom/script/ScriptLoadContext.h
@@ -20,12 +20,16 @@
 #include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/CORSMode.h"
+#include "mozilla/LinkedList.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/MaybeOneOf.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/PreloaderBase.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/TaskController.h"  // mozilla::Task
 #include "mozilla/Utf8.h"            // mozilla::Utf8Unit
+#include "mozilla/Variant.h"
 #include "mozilla/dom/SRIMetadata.h"
 #include "mozilla/net/UrlClassifierCommon.h"
 #include "nsCOMPtr.h"
diff --git a/dom/serviceworkers/ServiceWorkerRegistrar.cpp b/dom/serviceworkers/ServiceWorkerRegistrar.cpp
@@ -12,6 +12,7 @@
 #include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/ErrorNames.h"
 #include "mozilla/ModuleUtils.h"
+#include "mozilla/ResultExtensions.h"
 #include "mozilla/Services.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPtr.h"
diff --git a/dom/simpledb/SDBConnection.cpp b/dom/simpledb/SDBConnection.cpp
@@ -21,6 +21,8 @@
 #include "js/RootingAPI.h"
 #include "js/TypeDecls.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/MacroForEach.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/dom/PBackgroundSDBConnection.h"
diff --git a/dom/simpledb/SDBResults.cpp b/dom/simpledb/SDBResults.cpp
@@ -13,6 +13,7 @@
 #include "ErrorList.h"
 #include "js/RootingAPI.h"
 #include "js/TypeDecls.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/dom/TypedArray.h"
 #include "nsDebug.h"
 #include "nsError.h"
diff --git a/dom/url/URLSearchParams.cpp b/dom/url/URLSearchParams.cpp
@@ -17,6 +17,7 @@
 #include "js/StructuredClone.h"
 #include "mozilla/ArrayIterator.h"
 #include "mozilla/ErrorResult.h"
+#include "mozilla/MacroForEach.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/Record.h"
 #include "mozilla/dom/StructuredCloneHolder.h"
diff --git a/dom/workers/ScriptLoader.cpp b/dom/workers/ScriptLoader.cpp
@@ -23,6 +23,7 @@
 #include "mozilla/Encoding.h"
 #include "mozilla/LoadContext.h"
 #include "mozilla/Maybe.h"
+#include "mozilla/ResultExtensions.h"
 #include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/dom/ClientChannelHelper.h"
diff --git a/dom/workers/WorkerError.cpp b/dom/workers/WorkerError.cpp
@@ -27,6 +27,7 @@
 #include "mozilla/ErrorResult.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/RefPtr.h"
+#include "mozilla/Span.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/ErrorEvent.h"
diff --git a/gfx/2d/DataSurfaceHelpers.cpp b/gfx/2d/DataSurfaceHelpers.cpp
@@ -9,6 +9,7 @@
 #include "2D.h"
 #include "DataSurfaceHelpers.h"
 #include "Logging.h"
+#include "mozilla/MathAlgorithms.h"
 #include "Swizzle.h"
 #include "Tools.h"
 
diff --git a/gfx/ipc/GPUParent.cpp b/gfx/ipc/GPUParent.cpp
@@ -33,6 +33,7 @@
 #include "mozilla/ProcessPriorityManager.h"
 #include "mozilla/RemoteMediaManagerChild.h"
 #include "mozilla/RemoteMediaManagerParent.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPrefs_media.h"
 #include "mozilla/TimeStamp.h"
diff --git a/gfx/layers/SurfacePool.h b/gfx/layers/SurfacePool.h
@@ -6,6 +6,8 @@
 #ifndef mozilla_layers_SurfacePool_h
 #define mozilla_layers_SurfacePool_h
 
+#include "mozilla/Maybe.h"
+
 #include "GLTypes.h"
 #include "nsISupportsImpl.h"
 #include "nsRegion.h"
diff --git a/gfx/layers/ipc/CompositorBridgeParent.cpp b/gfx/layers/ipc/CompositorBridgeParent.cpp
@@ -58,6 +58,7 @@
 #include "mozilla/webrender/RenderThread.h"
 #include "mozilla/media/MediaSystemResourceService.h"  // for MediaSystemResourceService
 #include "mozilla/mozalloc.h"                          // for operator new, etc
+#include "mozilla/PodOperations.h"
 #include "mozilla/ProfilerLabels.h"
 #include "mozilla/ProfilerMarkers.h"
 #include "mozilla/glean/GfxMetrics.h"
diff --git a/gfx/layers/wr/WebRenderBridgeParent.h b/gfx/layers/wr/WebRenderBridgeParent.h
@@ -15,6 +15,7 @@
 #include "mozilla/layers/CompositableTransactionParent.h"
 #include "mozilla/layers/CompositorVsyncSchedulerOwner.h"
 #include "mozilla/layers/PWebRenderBridgeParent.h"
+#include "mozilla/HashTable.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/webrender/WebRenderTypes.h"
diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp
@@ -8,6 +8,7 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/FontPropertyTypes.h"
 #include "mozilla/gfx/2D.h"
+#include "mozilla/IntegerRange.h"
 #include "mozilla/intl/Segmenter.h"
 #include "mozilla/StaticPrefs_gfx.h"
 #include "mozilla/ScopeExit.h"
diff --git a/gfx/thebes/gfxFontEntry.cpp b/gfx/thebes/gfxFontEntry.cpp
@@ -6,6 +6,7 @@
 #include "gfxFontEntry.h"
 
 #include "mozilla/FontPropertyTypes.h"
+#include "mozilla/MathAlgorithms.h"
 
 #include "mozilla/Logging.h"
 
diff --git a/gfx/vr/gfxVR.h b/gfx/vr/gfxVR.h
@@ -11,6 +11,7 @@
 #include "nsTArray.h"
 #include "nsString.h"
 #include "nsCOMPtr.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/TiedFields.h"
 #include "mozilla/TimeStamp.h"
diff --git a/image/Image.h b/image/Image.h
@@ -7,6 +7,7 @@
 #define mozilla_image_Image_h
 
 #include "mozilla/Attributes.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/ProfilerMarkers.h"
 #include "mozilla/SizeOfState.h"
diff --git a/image/RasterImage.cpp b/image/RasterImage.cpp
@@ -27,6 +27,7 @@
 #include "gfxContext.h"
 #include "gfxPlatform.h"
 #include "mozilla/ClearOnShutdown.h"
+#include "mozilla/Likely.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/SizeOfState.h"
 #include "mozilla/StaticPrefs_image.h"
diff --git a/intl/components/src/DateTimeFormat.h b/intl/components/src/DateTimeFormat.h
@@ -6,6 +6,7 @@
 #include <functional>
 #include "unicode/udat.h"
 
+#include "mozilla/Assertions.h"
 #include "mozilla/intl/ICU4CGlue.h"
 #include "mozilla/intl/ICUError.h"
 
@@ -15,6 +16,7 @@
 #include "mozilla/Span.h"
 #include "mozilla/Try.h"
 #include "mozilla/UniquePtr.h"
+#include "mozilla/Utf8.h"
 #include "mozilla/Vector.h"
 
 /*
diff --git a/intl/components/src/NumberFormat.h b/intl/components/src/NumberFormat.h
@@ -10,6 +10,7 @@
 #include "mozilla/Maybe.h"
 #include "mozilla/PodOperations.h"
 #include "mozilla/Result.h"
+#include "mozilla/Utf8.h"
 #include "mozilla/intl/ICUError.h"
 #include "mozilla/intl/NumberPart.h"
 
diff --git a/intl/components/src/PluralRules.cpp b/intl/components/src/PluralRules.cpp
@@ -7,6 +7,7 @@
 #include "mozilla/intl/ICU4CGlue.h"
 #include "mozilla/intl/NumberFormat.h"
 #include "mozilla/intl/NumberRangeFormat.h"
+#include "mozilla/PodOperations.h"
 #include "mozilla/Span.h"
 #include "ScopedICUObject.h"
 
diff --git a/ipc/chromium/src/chrome/common/ipc_channel_posix.cc b/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
@@ -38,6 +38,7 @@
 #include "chrome/common/ipc_message_utils.h"
 #include "mozilla/ipc/Endpoint.h"
 #include "mozilla/ipc/ProtocolUtils.h"
+#include "mozilla/Atomics.h"
 #include "mozilla/StaticMutex.h"
 #include "mozilla/UniquePtr.h"
 
diff --git a/ipc/chromium/src/chrome/common/ipc_channel_win.cc b/ipc/chromium/src/chrome/common/ipc_channel_win.cc
@@ -22,6 +22,7 @@
 #include "chrome/common/ipc_channel_utils.h"
 #include "chrome/common/ipc_message_utils.h"
 #include "mozilla/ipc/ProtocolUtils.h"
+#include "mozilla/Atomics.h"
 #include "mozilla/LateWriteChecks.h"
 #include "mozilla/RandomNum.h"
 #include "nsThreadUtils.h"
diff --git a/ipc/glue/IdleSchedulerParent.h b/ipc/glue/IdleSchedulerParent.h
@@ -7,6 +7,7 @@
 #ifndef mozilla_ipc_IdleSchedulerParent_h__
 #define mozilla_ipc_IdleSchedulerParent_h__
 
+#include "mozilla/Assertions.h"
 #include "mozilla/LinkedList.h"
 #include "mozilla/ipc/PIdleSchedulerParent.h"
 #include "mozilla/ipc/SharedMemoryMapping.h"
diff --git a/ipc/glue/MessageChannel.cpp b/ipc/glue/MessageChannel.cpp
@@ -15,6 +15,7 @@
 #include "base/waitable_event.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/CycleCollectedJSContext.h"
+#include "mozilla/Fuzzing.h"
 #include "mozilla/FlowMarkers.h"
 #include "mozilla/IntentionalCrash.h"
 #include "mozilla/Logging.h"
diff --git a/ipc/glue/ProcessUtils.h b/ipc/glue/ProcessUtils.h
@@ -13,6 +13,7 @@
 #include "mozilla/ipc/FileDescriptor.h"
 #include "mozilla/ipc/SharedMemoryHandle.h"
 #include "mozilla/ipc/SharedMemoryMapping.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/Preferences.h"
 #include "nsXULAppAPI.h"
 
diff --git a/ipc/glue/SerializedStructuredCloneBuffer.h b/ipc/glue/SerializedStructuredCloneBuffer.h
@@ -13,6 +13,8 @@
 #include "chrome/common/ipc_message_utils.h"
 #include "js/AllocPolicy.h"
 #include "js/StructuredClone.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/BufferList.h"
 #include "mozilla/mozalloc.h"
 class PickleIterator;
 
diff --git a/js/loader/ScriptLoadRequest.h b/js/loader/ScriptLoadRequest.h
@@ -15,10 +15,12 @@
 #include "mozilla/dom/CacheExpirationTime.h"
 #include "mozilla/dom/SRIMetadata.h"
 #include "mozilla/LinkedList.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/PreloaderBase.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/SharedSubResourceCache.h"  // mozilla::SubResourceNetworkMetadataHolder
 #include "mozilla/StaticPrefs_dom.h"
+#include "mozilla/Variant.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIGlobalObject.h"
 #include "LoadedScript.h"
diff --git a/js/src/builtin/intl/Segmenter.cpp b/js/src/builtin/intl/Segmenter.cpp
@@ -9,6 +9,7 @@
 #include "builtin/intl/Segmenter.h"
 
 #include "mozilla/Assertions.h"
+#include "mozilla/IntegerTypeTraits.h"
 #include "mozilla/UniquePtr.h"
 
 #include "jspubtd.h"
diff --git a/js/src/builtin/temporal/TimeZone.cpp b/js/src/builtin/temporal/TimeZone.cpp
@@ -10,6 +10,7 @@
 #include "mozilla/intl/TimeZone.h"
 #include "mozilla/Likely.h"
 #include "mozilla/Maybe.h"
+#include "mozilla/Range.h"
 #include "mozilla/Span.h"
 #include "mozilla/UniquePtr.h"
 
diff --git a/js/src/debugger/DebuggerMemory.cpp b/js/src/debugger/DebuggerMemory.cpp
@@ -6,6 +6,8 @@
 
 #include "debugger/DebuggerMemory.h"
 
+#include "mozilla/Maybe.h"
+
 #include <stdlib.h>
 
 #include "jsapi.h"
diff --git a/js/src/ds/Bitmap.h b/js/src/ds/Bitmap.h
@@ -9,6 +9,7 @@
 
 #include "mozilla/Array.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/Atomics.h"
 #include "mozilla/Attributes.h"
 
 #include <algorithm>
diff --git a/js/src/gc/Nursery.cpp b/js/src/gc/Nursery.cpp
@@ -9,6 +9,7 @@
 
 #include "mozilla/DebugOnly.h"
 #include "mozilla/IntegerPrintfMacros.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/TimeStamp.h"
 
diff --git a/js/src/jit/JitcodeMap.cpp b/js/src/jit/JitcodeMap.cpp
@@ -7,6 +7,7 @@
 #include "jit/JitcodeMap.h"
 
 #include "mozilla/ArrayUtils.h"
+#include "mozilla/MathAlgorithms.h"
 #include "mozilla/Maybe.h"
 
 #include "gc/Marking.h"
diff --git a/js/src/jit/mips64/Simulator-mips64.cpp b/js/src/jit/mips64/Simulator-mips64.cpp
@@ -31,6 +31,7 @@
 
 #include "mozilla/Casting.h"
 #include "mozilla/IntegerPrintfMacros.h"
+#include "mozilla/Likely.h"
 
 #include <float.h>
 #include <limits>
diff --git a/js/src/jit/riscv64/Simulator-riscv64.cpp b/js/src/jit/riscv64/Simulator-riscv64.cpp
@@ -30,7 +30,9 @@
 #  include "jit/riscv64/Simulator-riscv64.h"
 
 #  include "mozilla/Casting.h"
+#  include "mozilla/FloatingPoint.h"
 #  include "mozilla/IntegerPrintfMacros.h"
+#  include "mozilla/Likely.h"
 
 #  include <cinttypes>
 #  include <float.h>
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
@@ -11,6 +11,9 @@
 
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/Maybe.h"
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/RangedPtr.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/Variant.h"
 
diff --git a/js/src/threading/Mutex.h b/js/src/threading/Mutex.h
@@ -8,6 +8,7 @@
 #define threading_Mutex_h
 
 #include "mozilla/Assertions.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/PlatformMutex.h"
 #include "mozilla/ThreadLocal.h"
 
diff --git a/js/src/vm/ErrorReporting.cpp b/js/src/vm/ErrorReporting.cpp
@@ -6,8 +6,6 @@
 
 #include "vm/ErrorReporting.h"
 
-#include "mozilla/PodOperations.h"
-
 #include <stdarg.h>
 #include <utility>
 
diff --git a/js/src/wasm/WasmCode.h b/js/src/wasm/WasmCode.h
@@ -27,6 +27,7 @@
 #include "mozilla/EnumeratedArray.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/MemoryReporting.h"
+#include "mozilla/PodOperations.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/UniquePtr.h"
diff --git a/js/src/wasm/WasmCodegenTypes.cpp b/js/src/wasm/WasmCodegenTypes.cpp
@@ -18,7 +18,6 @@
 
 #include "wasm/WasmCodegenTypes.h"
 
-#include "mozilla/PodOperations.h"
 #include "wasm/WasmExprType.h"
 #include "wasm/WasmStubs.h"
 #include "wasm/WasmSummarizeInsn.h"
diff --git a/js/xpconnect/loader/URLPreloader.h b/js/xpconnect/loader/URLPreloader.h
@@ -13,6 +13,7 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/Omnijar.h"
+#include "mozilla/Range.h"
 #include "mozilla/Result.h"
 #include "nsClassHashtable.h"
 #include "nsHashKeys.h"
diff --git a/js/xpconnect/src/XPCJSContext.cpp b/js/xpconnect/src/XPCJSContext.cpp
@@ -6,6 +6,7 @@
 
 /* Per JSContext object */
 
+#include "mozilla/MemoryReporting.h"
 #include "mozilla/UniquePtr.h"
 
 #include "xpcprivate.h"
diff --git a/layout/base/AnchorPositioningUtils.h b/layout/base/AnchorPositioningUtils.h
@@ -8,6 +8,7 @@
 #define AnchorPositioningUtils_h__
 
 #include "WritingModes.h"
+#include "mozilla/EnumSet.h"
 #include "mozilla/Maybe.h"
 #include "nsRect.h"
 #include "nsTHashMap.h"
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
@@ -23,6 +23,7 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/Likely.h"
+#include "mozilla/LinkedList.h"
 #include "mozilla/ManualNAC.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/PresShellInlines.h"
diff --git a/layout/generic/ScrollContainerFrame.h b/layout/generic/ScrollContainerFrame.h
@@ -14,6 +14,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/ScrollOrigin.h"
 #include "mozilla/ScrollTypes.h"
+#include "mozilla/TypedEnumBits.h"
 #include "mozilla/dom/WindowBinding.h"  // for mozilla::dom::ScrollBehavior
 #include "mozilla/layout/ScrollAnchorContainer.h"
 #include "nsContainerFrame.h"
diff --git a/layout/painting/nsCSSRendering.cpp b/layout/painting/nsCSSRendering.cpp
@@ -24,6 +24,7 @@
 #include "gfxUtils.h"
 #include "imgIContainer.h"
 #include "mozilla/ComputedStyle.h"
+#include "mozilla/HashFunctions.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/ProfilerLabels.h"
 #include "mozilla/SVGImageContext.h"
diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp
@@ -35,6 +35,7 @@
 #include "mozilla/EffectCompositor.h"
 #include "mozilla/EffectSet.h"
 #include "mozilla/EventStateManager.h"
+#include "mozilla/HashTable.h"
 #include "mozilla/Likely.h"
 #include "mozilla/LookAndFeel.h"
 #include "mozilla/OperatorNewExtensions.h"
diff --git a/layout/style/ServoStyleConstsForwards.h b/layout/style/ServoStyleConstsForwards.h
@@ -21,9 +21,11 @@
 #  include "Units.h"
 #  include "mozilla/AtomArray.h"
 #  include "mozilla/CORSMode.h"
+#  include "mozilla/IntegerRange.h"
 #  include "mozilla/MemoryReporting.h"
 #  include "mozilla/ServoBindingTypes.h"
 #  include "mozilla/ServoTypes.h"
+#  include "mozilla/Span.h"
 #  include "mozilla/gfx/Types.h"
 #  include "mozilla/image/Resolution.h"
 #  include "nsColor.h"
diff --git a/layout/style/ServoStyleConstsInlines.h b/layout/style/ServoStyleConstsInlines.h
@@ -15,7 +15,6 @@
 #include "MainThreadUtils.h"
 #include "mozilla/AspectRatio.h"
 #include "mozilla/EndianUtils.h"
-#include "mozilla/IntegerRange.h"
 #include "mozilla/ServoStyleConsts.h"
 #include "mozilla/URLExtraData.h"
 #include "mozilla/dom/WorkerCommon.h"
diff --git a/layout/style/StyleAnimationValue.cpp b/layout/style/StyleAnimationValue.cpp
@@ -13,6 +13,7 @@
 #include "gfxQuaternion.h"
 #include "mozilla/ComputedStyle.h"
 #include "mozilla/ComputedStyleInlines.h"
+#include "mozilla/Likely.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/PresShellInlines.h"
 #include "mozilla/ServoBindings.h"  // StyleLockedDeclarationBlock
diff --git a/layout/style/nsCSSValue.cpp b/layout/style/nsCSSValue.cpp
@@ -12,6 +12,7 @@
 #include "imgRequestProxy.h"
 #include "mozilla/CORSMode.h"
 #include "mozilla/FontPropertyTypes.h"
+#include "mozilla/Likely.h"
 #include "mozilla/ServoBindings.h"
 #include "mozilla/ServoStyleSet.h"
 #include "mozilla/ServoTypes.h"
diff --git a/media/webrtc/signaling/gtest/jsep_session_unittest.cpp b/media/webrtc/signaling/gtest/jsep_session_unittest.cpp
@@ -11,6 +11,7 @@
 #include "ssl.h"
 
 #include "mozilla/Preferences.h"
+#include "mozilla/RefPtr.h"
 
 #define GTEST_HAS_RTTI 0
 #include "gmock/gmock.h"
diff --git a/memory/build/Globals.h b/memory/build/Globals.h
@@ -11,6 +11,7 @@
 // or the page size.  Page size isn't always known at compile time so some
 // values defined here may be determined at runtime.
 
+#include "mozilla/Assertions.h"
 #include "mozilla/Literals.h"
 #include "mozilla/MathAlgorithms.h"
 
diff --git a/mfbt/tests/gtest/TestTainting.cpp b/mfbt/tests/gtest/TestTainting.cpp
@@ -8,6 +8,7 @@
 #include <math.h>
 
 #include "mozilla/Array.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/Tainting.h"
 #include "nsTHashtable.h"
 #include "nsHashKeys.h"
diff --git a/modules/libpref/SharedPrefMap.h b/modules/libpref/SharedPrefMap.h
@@ -7,6 +7,7 @@
 #ifndef dom_ipc_SharedPrefMap_h
 #define dom_ipc_SharedPrefMap_h
 
+#include "mozilla/HashFunctions.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Result.h"
 #include "mozilla/dom/ipc/StringTable.h"
diff --git a/netwerk/dns/nsDNSService2.cpp b/netwerk/dns/nsDNSService2.cpp
@@ -44,6 +44,7 @@
 #include "mozilla/StaticPrefs_network.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/SyncRunnable.h"
+#include "mozilla/TextUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::net;
diff --git a/netwerk/dns/nsEffectiveTLDService.cpp b/netwerk/dns/nsEffectiveTLDService.cpp
@@ -10,7 +10,10 @@
 
 #include "mozilla/Components.h"
 #include "mozilla/ClearOnShutdown.h"
+#include "mozilla/HashFunctions.h"
 #include "mozilla/MemoryReporting.h"
+#include "mozilla/ResultExtensions.h"
+#include "mozilla/TextUtils.h"
 
 #include "MainThreadUtils.h"
 #include "nsContentUtils.h"
diff --git a/netwerk/dns/nsIDNService.cpp b/netwerk/dns/nsIDNService.cpp
@@ -17,6 +17,7 @@
 #include "harfbuzz/hb.h"
 #include "mozilla/Casting.h"
 #include "mozilla/StaticPrefs_network.h"
+#include "mozilla/TextUtils.h"
 #include "mozilla/intl/UnicodeProperties.h"
 #include "mozilla/intl/UnicodeScriptCodes.h"
 #include "nsNetUtil.h"
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -117,6 +117,7 @@
 #include "mozilla/extensions/StreamFilterParent.h"
 #include "mozilla/net/Predictor.h"
 #include "mozilla/net/SFVService.h"
+#include "mozilla/MathAlgorithms.h"
 #include "mozilla/NullPrincipal.h"
 #include "CacheControlParser.h"
 #include "nsMixedContentBlocker.h"
diff --git a/parser/html/nsHtml5Portability.cpp b/parser/html/nsHtml5Portability.cpp
@@ -7,6 +7,7 @@
 #include "nsAtom.h"
 #include "nsHtml5TreeBuilder.h"
 #include "nsString.h"
+#include "mozilla/CheckedInt.h"
 
 nsAtom* nsHtml5Portability::newLocalNameFromBuffer(char16_t* buf,
                                                    int32_t length,
diff --git a/parser/html/nsHtml5TreeBuilder.h b/parser/html/nsHtml5TreeBuilder.h
@@ -33,6 +33,7 @@
 
 #include "jArray.h"
 #include "mozilla/ImportScanner.h"
+#include "mozilla/Likely.h"
 #include "nsAHtml5TreeBuilderState.h"
 #include "nsAtom.h"
 #include "nsContentUtils.h"
diff --git a/security/certverifier/NSSCertDBTrustDomain.cpp b/security/certverifier/NSSCertDBTrustDomain.cpp
@@ -20,6 +20,7 @@
 #include "certdb.h"
 #include "mozilla/AppShutdown.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/Casting.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/Logging.h"
 #include "mozilla/Services.h"
diff --git a/security/manager/ssl/nsNSSCertHelper.cpp b/security/manager/ssl/nsNSSCertHelper.cpp
@@ -6,6 +6,7 @@
 
 #include "ScopedNSSTypes.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/Casting.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/Utf8.h"
 #include "mozilla/net/DNS.h"
diff --git a/security/manager/ssl/nsNSSCertificate.cpp b/security/manager/ssl/nsNSSCertificate.cpp
@@ -12,8 +12,10 @@
 #include "certdb.h"
 #include "ipc/IPCMessageUtils.h"
 #include "ipc/IPCMessageUtilsSpecializations.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/Base64.h"
 #include "mozilla/Casting.h"
+#include "mozilla/NotNull.h"
 #include "mozilla/Span.h"
 #include "mozilla/ipc/TransportSecurityInfoUtils.h"
 #include "mozilla/net/DNS.h"
diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp
@@ -21,8 +21,10 @@
 #include "mozilla/Atomics.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Base64.h"
+#include "mozilla/Casting.h"
 #include "mozilla/EndianUtils.h"
 #include "mozilla/FilePreferences.h"
+#include "mozilla/PodOperations.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/ProfilerLabels.h"
 #include "mozilla/ProfilerMarkers.h"
diff --git a/security/sandbox/linux/Sandbox.cpp b/security/sandbox/linux/Sandbox.cpp
@@ -39,6 +39,7 @@
 #include "mozilla/Array.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/Range.h"
 #include "mozilla/SandboxInfo.h"
 #include "mozilla/StackWalk.h"
 #include "mozilla/UniquePtr.h"
diff --git a/startupcache/test/TestStartupCache.cpp b/startupcache/test/TestStartupCache.cpp
@@ -20,6 +20,7 @@
 #include "prio.h"
 #include "prprf.h"
 #include "mozilla/gtest/MozAssertions.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/Printf.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/UniquePtrExtensions.h"
diff --git a/testing/gtest/mozilla/gmock-custom/gmock-matchers.h b/testing/gtest/mozilla/gmock-custom/gmock-matchers.h
@@ -35,6 +35,7 @@
 #define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
 
 #include "nsTArray.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/media/MediaUtils.h"
 
 namespace testing {
diff --git a/toolkit/components/antitracking/ContentBlockingLog.cpp b/toolkit/components/antitracking/ContentBlockingLog.cpp
@@ -17,7 +17,9 @@
 #include "nsTArray.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/ClearOnShutdown.h"
+#include "mozilla/HashFunctions.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/RandomNum.h"
 #include "mozilla/ReverseIterator.h"
 #include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/StaticPrefs_privacy.h"
diff --git a/toolkit/components/backgroundhangmonitor/HangAnnotations.h b/toolkit/components/backgroundhangmonitor/HangAnnotations.h
@@ -11,6 +11,7 @@
 
 #include "ipc/IPCMessageUtilsSpecializations.h"
 #include "mozilla/HangTypes.h"
+#include "mozilla/MemoryReporting.h"
 #include "mozilla/Mutex.h"
 #include "nsString.h"
 #include "nsTArray.h"
diff --git a/toolkit/components/extensions/MatchPattern.h b/toolkit/components/extensions/MatchPattern.h
@@ -15,6 +15,7 @@
 #include "jspubtd.h"
 
 #include "mozilla/ClearOnShutdown.h"
+#include "mozilla/Likely.h"
 #include "mozilla/Maybe.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
diff --git a/toolkit/components/glean/tests/gtest/TestFog.cpp b/toolkit/components/glean/tests/gtest/TestFog.cpp
@@ -9,6 +9,7 @@
 #include "mozilla/glean/GleanPings.h"
 #include "mozilla/glean/fog_ffi_generated.h"
 #include "mozilla/Maybe.h"
+#include "mozilla/ResultVariant.h"
 #include "mozilla/TimeStamp.h"
 #include "../../bindings/private/Common.h"
 
diff --git a/toolkit/components/ml/backends/llama/LlamaBackend.cpp b/toolkit/components/ml/backends/llama/LlamaBackend.cpp
@@ -10,6 +10,7 @@
 #include <cstddef>
 
 #include <functional>
+#include "mozilla/ResultVariant.h"
 #include "mozilla/HashTable.h"
 #include "nsIFileStreams.h"
 #include "nsTArray.h"
diff --git a/toolkit/components/ml/backends/llama/LlamaBackend.h b/toolkit/components/ml/backends/llama/LlamaBackend.h
@@ -13,7 +13,6 @@
 #include "ggml-cpu.h"
 #include "mozilla/dom/LlamaRunnerBinding.h"
 #include "mozilla/Result.h"
-#include "mozilla/ResultVariant.h"
 #include "mozilla/UniquePtr.h"
 
 namespace mozilla::llama {
diff --git a/toolkit/components/ml/backends/llama/LlamaRunner.h b/toolkit/components/ml/backends/llama/LlamaRunner.h
@@ -21,6 +21,7 @@
 #include "mozilla/llama/LlamaBackend.h"
 
 #include "prsystem.h"
+#include "mozilla/Casting.h"
 #include "mozilla/SPSCQueue.h"
 #include "mozilla/Array.h"
 #include <cstdint>
diff --git a/toolkit/components/remote/nsDBusRemoteClient.h b/toolkit/components/remote/nsDBusRemoteClient.h
@@ -12,6 +12,7 @@
 #endif
 #include "nsRemoteClient.h"
 #include "mozilla/DBusHelpers.h"
+#include "mozilla/RefPtr.h"
 #include "nsString.h"
 #include "nscore.h"
 
diff --git a/toolkit/components/resistfingerprinting/nsRFPService.cpp b/toolkit/components/resistfingerprinting/nsRFPService.cpp
@@ -24,11 +24,13 @@
 #include "mozilla/ArrayIterator.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Atomics.h"
+#include "mozilla/Casting.h"
 #include "mozilla/Components.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/ContentBlockingNotifier.h"
 #include "mozilla/glean/ResistfingerprintingMetrics.h"
 #include "mozilla/HashFunctions.h"
+#include "mozilla/HelperMacros.h"
 #include "mozilla/Likely.h"
 #include "mozilla/Logging.h"
 #include "mozilla/LookAndFeel.h"
diff --git a/toolkit/components/sessionstore/BrowserSessionStore.cpp b/toolkit/components/sessionstore/BrowserSessionStore.cpp
@@ -10,7 +10,9 @@
 #include <functional>
 
 #include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/ClearOnShutdown.h"
+#include "mozilla/IntegerRange.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/StaticPtr.h"
 
diff --git a/toolkit/components/sessionstore/SessionStoreFormData.cpp b/toolkit/components/sessionstore/SessionStoreFormData.cpp
@@ -6,6 +6,7 @@
 
 #include "mozilla/dom/SessionStoreFormData.h"
 
+#include "mozilla/Assertions.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/BrowserSessionStoreBinding.h"
 #include "mozilla/dom/BrowsingContext.h"
diff --git a/toolkit/components/sessionstore/SessionStoreParent.cpp b/toolkit/components/sessionstore/SessionStoreParent.cpp
@@ -7,6 +7,7 @@
 #include "mozilla/dom/SessionStoreParent.h"
 
 #include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/dom/BrowserParent.h"
diff --git a/toolkit/components/sessionstore/SessionStoreScrollData.cpp b/toolkit/components/sessionstore/SessionStoreScrollData.cpp
@@ -9,6 +9,7 @@
 
 #include "js/PropertyAndElement.h"
 #include "js/TypeDecls.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/BrowserSessionStoreBinding.h"
 #include "mozilla/dom/BrowsingContext.h"
diff --git a/toolkit/components/telemetry/core/Telemetry.cpp b/toolkit/components/telemetry/core/Telemetry.cpp
@@ -34,6 +34,7 @@
 #endif
 #include "mozilla/Components.h"
 #include "mozilla/DataMutex.h"
+#include "mozilla/FStream.h"
 #include "mozilla/IOInterposer.h"
 #include "mozilla/Likely.h"
 #include "mozilla/MemoryReporting.h"
diff --git a/toolkit/library/nsDllMain.cpp b/toolkit/library/nsDllMain.cpp
@@ -5,6 +5,7 @@
 
 #include <windows.h>
 #include "nsToolkit.h"
+#include "mozilla/Assertions.h"
 
 #if defined(__GNUC__)
 // If DllMain gets name mangled, it won't be seen.
diff --git a/toolkit/mozapps/defaultagent/Policy.cpp b/toolkit/mozapps/defaultagent/Policy.cpp
@@ -15,6 +15,7 @@
 #include "UtfConvert.h"
 
 #include "json/json.h"
+#include "mozilla/HelperMacros.h"
 #include "mozilla/WinHeaderOnlyUtils.h"
 
 // There is little logging or error handling in this file, because the file and
diff --git a/toolkit/xre/AutoSQLiteLifetime.cpp b/toolkit/xre/AutoSQLiteLifetime.cpp
@@ -8,6 +8,7 @@
 #include "sqlite3.h"
 #include "sqlite3_static_ext.h"
 #include "mozilla/Atomics.h"
+#include "mozilla/DebugOnly.h"
 
 #ifdef MOZ_MEMORY
 #  include "mozmemory.h"
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
@@ -18,6 +18,8 @@
 #include "mozilla/IOInterposer.h"
 #include "mozilla/ipc/UtilityProcessChild.h"
 #include "mozilla/Likely.h"
+#include "mozilla/MemoryChecking.h"
+#include "mozilla/Poison.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/PreferenceSheet.h"
 #include "mozilla/Printf.h"
diff --git a/tools/profiler/public/GeckoProfiler.h b/tools/profiler/public/GeckoProfiler.h
@@ -105,6 +105,7 @@ static inline void profiler_record_wakeup_count(
 #else  // !MOZ_GECKO_PROFILER
 
 #  include "js/ProfilingStack.h"
+#  include "mozilla/Assertions.h"
 #  include "mozilla/Attributes.h"
 #  include "mozilla/BaseProfilerRAIIMacro.h"
 #  include "mozilla/Maybe.h"
diff --git a/tools/profiler/public/ProfilerLabels.h b/tools/profiler/public/ProfilerLabels.h
@@ -18,6 +18,7 @@
 #include "js/ProfilingCategory.h"
 #include "js/ProfilingStack.h"
 #include "js/RootingAPI.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/BaseProfilerRAIIMacro.h"
 #include "mozilla/Maybe.h"
diff --git a/uriloader/preload/PreloadService.cpp b/uriloader/preload/PreloadService.cpp
@@ -9,6 +9,7 @@
 #include "PreloaderBase.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/AsyncEventDispatcher.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/dom/FetchPriority.h"
 #include "mozilla/dom/HTMLLinkElement.h"
 #include "mozilla/dom/ScriptLoader.h"
diff --git a/view/nsView.cpp b/view/nsView.cpp
@@ -7,7 +7,9 @@
 
 #include "nsDeviceContext.h"
 #include "mozilla/BasicEvents.h"
+#include "mozilla/DebugOnly.h"
 #include "mozilla/IntegerPrintfMacros.h"
+#include "mozilla/Likely.h"
 #include "mozilla/Poison.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/StaticPrefs_layout.h"
diff --git a/widget/ClipboardContentAnalysisParent.cpp b/widget/ClipboardContentAnalysisParent.cpp
@@ -9,6 +9,7 @@
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/WindowContext.h"
 #include "mozilla/dom/WindowGlobalParent.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/MozPromise.h"
 #include "nsBaseClipboard.h"
 #include "nsIClipboard.h"
diff --git a/xpcom/base/MacStringHelpers.mm b/xpcom/base/MacStringHelpers.mm
@@ -7,6 +7,7 @@
 #include "MacStringHelpers.h"
 #include "nsObjCExceptions.h"
 
+#include "mozilla/IntegerTypeTraits.h"
 #include <limits>
 
 namespace mozilla {
diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp
@@ -30,6 +30,7 @@
 #include "nsThread.h"
 #include "VRProcessManager.h"
 #include "mozilla/MemoryReportingProcess.h"
+#include "mozilla/PodOperations.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/RDDProcessManager.h"
 #include "mozilla/Services.h"