diff --git a/browser/app/winlauncher/freestanding/SafeThreadLocal.h b/browser/app/winlauncher/freestanding/SafeThreadLocal.h
index c513214a27a4d..e4b869f649d01 100644
--- a/browser/app/winlauncher/freestanding/SafeThreadLocal.h
+++ b/browser/app/winlauncher/freestanding/SafeThreadLocal.h
@@ -11,7 +11,6 @@
 
 #include "mozilla/NativeNt.h"
 #include "mozilla/ThreadLocal.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 namespace freestanding {
diff --git a/dom/animation/Animation.cpp b/dom/animation/Animation.cpp
index 9a46b21f57f2d..50eebbe70fa1a 100644
--- a/dom/animation/Animation.cpp
+++ b/dom/animation/Animation.cpp
@@ -20,7 +20,6 @@
 #include "mozilla/DeclarationBlock.h"
 #include "mozilla/Maybe.h"       // For Maybe
 #include "mozilla/StaticPrefs_dom.h"
-#include "mozilla/TypeTraits.h"  // For std::forward<>
 #include "nsAnimationManager.h"  // For CSSAnimation
 #include "nsComputedDOMStyle.h"
 #include "nsDOMMutationObserver.h"    // For nsAutoAnimationMutationBatch
diff --git a/dom/animation/EffectCompositor.cpp b/dom/animation/EffectCompositor.cpp
index 40000914f338c..842adbacf7a1e 100644
--- a/dom/animation/EffectCompositor.cpp
+++ b/dom/animation/EffectCompositor.cpp
@@ -27,7 +27,6 @@
 #include "mozilla/ServoStyleSet.h"
 #include "mozilla/StaticPrefs_layers.h"
 #include "mozilla/StyleAnimationValue.h"
-#include "mozilla/TypeTraits.h"  // For std::forward<>
 #include "nsContentUtils.h"
 #include "nsCSSPseudoElements.h"
 #include "nsCSSPropertyIDSet.h"
diff --git a/dom/animation/KeyframeEffect.cpp b/dom/animation/KeyframeEffect.cpp
index 213d71e7789b1..c5ab8891d1411 100644
--- a/dom/animation/KeyframeEffect.cpp
+++ b/dom/animation/KeyframeEffect.cpp
@@ -26,7 +26,6 @@
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPrefs_gfx.h"
 #include "mozilla/StaticPrefs_layers.h"
-#include "mozilla/TypeTraits.h"
 #include "Layers.h"              // For Layer
 #include "nsComputedDOMStyle.h"  // nsComputedDOMStyle::GetComputedStyle
 #include "nsContentUtils.h"
diff --git a/dom/bindings/ToJSValue.h b/dom/bindings/ToJSValue.h
index fd7c9b9056295..fdf75e3199469 100644
--- a/dom/bindings/ToJSValue.h
+++ b/dom/bindings/ToJSValue.h
@@ -7,7 +7,6 @@
 #ifndef mozilla_dom_ToJSValue_h
 #define mozilla_dom_ToJSValue_h
 
-#include "mozilla/TypeTraits.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/dom/BindingUtils.h"
diff --git a/dom/canvas/ProducerConsumerQueue.h b/dom/canvas/ProducerConsumerQueue.h
index 25540d5b25786..1c285b5d88800 100644
--- a/dom/canvas/ProducerConsumerQueue.h
+++ b/dom/canvas/ProducerConsumerQueue.h
@@ -19,7 +19,6 @@
 #include "mozilla/ipc/ProtocolUtils.h"
 #include "mozilla/Logging.h"
 #include "mozilla/TimeStamp.h"
-#include "mozilla/TypeTraits.h"
 #include "nsString.h"
 #include "CrossProcessSemaphore.h"
 
diff --git a/dom/indexedDB/ActorsChild.cpp b/dom/indexedDB/ActorsChild.cpp
index 21da140a33b38..6b41372d3f6a0 100644
--- a/dom/indexedDB/ActorsChild.cpp
+++ b/dom/indexedDB/ActorsChild.cpp
@@ -27,7 +27,6 @@
 #include "mozilla/CycleCollectedJSRuntime.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/SnappyUncompressInputStream.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/PermissionMessageUtils.h"
diff --git a/dom/media/MediaEventSource.h b/dom/media/MediaEventSource.h
index e224ce695d88e..33f2a34faf8ae 100644
--- a/dom/media/MediaEventSource.h
+++ b/dom/media/MediaEventSource.h
@@ -14,7 +14,6 @@
 #include "mozilla/Atomics.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/Tuple.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/Unused.h"
 
 #include "nsISupportsImpl.h"
diff --git a/dom/media/doctor/DDLoggedTypeTraits.h b/dom/media/doctor/DDLoggedTypeTraits.h
index feaf28f02719d..2c9de4dbc58e1 100644
--- a/dom/media/doctor/DDLoggedTypeTraits.h
+++ b/dom/media/doctor/DDLoggedTypeTraits.h
@@ -9,8 +9,6 @@
 
 #include <type_traits>
 
-#include "mozilla/TypeTraits.h"
-
 namespace mozilla {
 
 // Templated struct carrying compile-time information about C++ types that may
diff --git a/dom/media/doctor/gtest/TestRollingNumber.cpp b/dom/media/doctor/gtest/TestRollingNumber.cpp
index 001432ac03d98..9c9beec9a96d6 100644
--- a/dom/media/doctor/gtest/TestRollingNumber.cpp
+++ b/dom/media/doctor/gtest/TestRollingNumber.cpp
@@ -7,7 +7,6 @@
 #include "RollingNumber.h"
 
 #include "mozilla/Assertions.h"
-#include "mozilla/TypeTraits.h"
 
 #include <cstdint>
 #include <gtest/gtest.h>
diff --git a/dom/media/mp4/MP4Metadata.h b/dom/media/mp4/MP4Metadata.h
index 18ed21c23cce5..df1e39ff1ca56 100644
--- a/dom/media/mp4/MP4Metadata.h
+++ b/dom/media/mp4/MP4Metadata.h
@@ -7,7 +7,6 @@
 
 #include <type_traits>
 
-#include "mozilla/TypeTraits.h"
 #include "mozilla/UniquePtr.h"
 #include "DecoderData.h"
 #include "Index.h"
diff --git a/dom/media/webaudio/WebAudioUtils.h b/dom/media/webaudio/WebAudioUtils.h
index 1849781cf22ba..bcc683ed91880 100644
--- a/dom/media/webaudio/WebAudioUtils.h
+++ b/dom/media/webaudio/WebAudioUtils.h
@@ -10,7 +10,6 @@
 #include <cmath>
 #include <limits>
 #include <type_traits>
-#include "mozilla/TypeTraits.h"
 #include "mozilla/FloatingPoint.h"
 #include "MediaSegment.h"
 
diff --git a/dom/promise/Promise-inl.h b/dom/promise/Promise-inl.h
index 32e8418248560..4ff32585babb1 100644
--- a/dom/promise/Promise-inl.h
+++ b/dom/promise/Promise-inl.h
@@ -11,7 +11,6 @@
 #include <utility>
 
 #include "mozilla/TupleCycleCollection.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/ResultExtensions.h"
 #include "mozilla/dom/PromiseNativeHandler.h"
 
diff --git a/dom/promise/Promise.h b/dom/promise/Promise.h
index ee8fb214f3035..c36ca7c4d70f6 100644
--- a/dom/promise/Promise.h
+++ b/dom/promise/Promise.h
@@ -16,7 +16,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/TimeStamp.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/WeakPtr.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/PromiseBinding.h"
diff --git a/dom/quota/ActorsParent.cpp b/dom/quota/ActorsParent.cpp
index c81e5db1d77f4..e473aa769306b 100644
--- a/dom/quota/ActorsParent.cpp
+++ b/dom/quota/ActorsParent.cpp
@@ -52,7 +52,6 @@
 #include "mozilla/StaticPtr.h"
 #include "mozilla/TextUtils.h"
 #include "mozilla/Telemetry.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/Unused.h"
 #include "mozStorageCID.h"
 #include "mozStorageHelper.h"
diff --git a/gfx/2d/BasePoint.h b/gfx/2d/BasePoint.h
index dbe79428ab32e..e48562ce5adc6 100644
--- a/gfx/2d/BasePoint.h
+++ b/gfx/2d/BasePoint.h
@@ -12,7 +12,6 @@
 #include <type_traits>
 #include "mozilla/Attributes.h"
 #include "mozilla/FloatingPoint.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 namespace gfx {
diff --git a/gfx/2d/BaseRect.h b/gfx/2d/BaseRect.h
index 2fde9abb12695..369ce3553817f 100644
--- a/gfx/2d/BaseRect.h
+++ b/gfx/2d/BaseRect.h
@@ -14,7 +14,6 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/FloatingPoint.h"
-#include "mozilla/TypeTraits.h"
 #include "Types.h"
 
 namespace mozilla {
diff --git a/gfx/2d/Coord.h b/gfx/2d/Coord.h
index bef7f2aecb3a4..4dbf0b5218742 100644
--- a/gfx/2d/Coord.h
+++ b/gfx/2d/Coord.h
@@ -8,7 +8,6 @@
 #define MOZILLA_GFX_COORD_H_
 
 #include "mozilla/Attributes.h"
-#include "mozilla/TypeTraits.h"  // For IsSame
 #include "Types.h"
 #include "BaseCoord.h"
 
diff --git a/gfx/2d/Point.h b/gfx/2d/Point.h
index f83d6e54f5019..fbe77d023bbe8 100644
--- a/gfx/2d/Point.h
+++ b/gfx/2d/Point.h
@@ -16,7 +16,6 @@
 #include "BasePoint4D.h"
 #include "BaseSize.h"
 #include "mozilla/Maybe.h"
-#include "mozilla/TypeTraits.h"
 
 #include <cmath>
 #include <type_traits>
diff --git a/ipc/glue/FileDescriptor.cpp b/ipc/glue/FileDescriptor.cpp
index 28fd00a45be12..b5d0ce8ca6fde 100644
--- a/ipc/glue/FileDescriptor.cpp
+++ b/ipc/glue/FileDescriptor.cpp
@@ -7,7 +7,6 @@
 #include "FileDescriptor.h"
 
 #include "mozilla/Assertions.h"
-#include "mozilla/TypeTraits.h"
 #include "nsDebug.h"
 
 #ifdef XP_WIN
diff --git a/ipc/glue/IPCMessageUtils.h b/ipc/glue/IPCMessageUtils.h
index b09344496189f..02093ee916f2b 100644
--- a/ipc/glue/IPCMessageUtils.h
+++ b/ipc/glue/IPCMessageUtils.h
@@ -22,7 +22,6 @@
 #ifdef XP_WIN
 #  include "mozilla/TimeStamp_windows.h"
 #endif
-#include "mozilla/TypeTraits.h"
 #include "mozilla/IntegerTypeTraits.h"
 #include "mozilla/Vector.h"
 
diff --git a/ipc/glue/ProtocolUtils.cpp b/ipc/glue/ProtocolUtils.cpp
index 51df181aa849a..ecae80d179942 100644
--- a/ipc/glue/ProtocolUtils.cpp
+++ b/ipc/glue/ProtocolUtils.cpp
@@ -30,8 +30,6 @@
 #if defined(XP_WIN)
 #  include "aclapi.h"
 #  include "sddl.h"
-
-#  include "mozilla/TypeTraits.h"
 #endif
 
 using namespace IPC;
diff --git a/mfbt/ArrayUtils.h b/mfbt/ArrayUtils.h
index 19a1d5301fcba..89fcfdc820a7b 100644
--- a/mfbt/ArrayUtils.h
+++ b/mfbt/ArrayUtils.h
@@ -23,7 +23,6 @@
 #  include "mozilla/Alignment.h"
 #  include "mozilla/Array.h"
 #  include "mozilla/EnumeratedArray.h"
-#  include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 
diff --git a/mfbt/Atomics.h b/mfbt/Atomics.h
index c13034a62e940..662ff6f4663b3 100644
--- a/mfbt/Atomics.h
+++ b/mfbt/Atomics.h
@@ -19,7 +19,6 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Compiler.h"
-#include "mozilla/TypeTraits.h"
 
 #include <atomic>
 
diff --git a/mfbt/BufferList.h b/mfbt/BufferList.h
index 3e84ecc2fe34c..7bcba36b61b79 100644
--- a/mfbt/BufferList.h
+++ b/mfbt/BufferList.h
@@ -17,7 +17,6 @@
 #include "mozilla/Maybe.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/ScopeExit.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/Types.h"
 #include "mozilla/Vector.h"
 
diff --git a/mfbt/Casting.h b/mfbt/Casting.h
index d75b461d14737..bd8b03f92edd2 100644
--- a/mfbt/Casting.h
+++ b/mfbt/Casting.h
@@ -10,7 +10,6 @@
 #define mozilla_Casting_h
 
 #include "mozilla/Assertions.h"
-#include "mozilla/TypeTraits.h"
 
 #include <cstring>
 #include <limits.h>
diff --git a/mfbt/CompactPair.h b/mfbt/CompactPair.h
index f1f20dda5637d..28b2dd001b49c 100644
--- a/mfbt/CompactPair.h
+++ b/mfbt/CompactPair.h
@@ -13,7 +13,6 @@
 #include <utility>
 
 #include "mozilla/Attributes.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 
diff --git a/mfbt/EndianUtils.h b/mfbt/EndianUtils.h
index 4203b6edff3e8..df9f60e475f81 100644
--- a/mfbt/EndianUtils.h
+++ b/mfbt/EndianUtils.h
@@ -70,7 +70,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/Compiler.h"
 #include "mozilla/DebugOnly.h"
-#include "mozilla/TypeTraits.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/mfbt/EnumTypeTraits.h b/mfbt/EnumTypeTraits.h
index faf3ea16e37df..d15aeddd55e48 100644
--- a/mfbt/EnumTypeTraits.h
+++ b/mfbt/EnumTypeTraits.h
@@ -8,6 +8,7 @@
 #ifndef mozilla_EnumTypeTraits_h
 #define mozilla_EnumTypeTraits_h
 
+#include <stddef.h>
 #include <type_traits>
 
 namespace mozilla {
diff --git a/mfbt/FloatingPoint.h b/mfbt/FloatingPoint.h
index db7622bddc3f3..e7877e64253b7 100644
--- a/mfbt/FloatingPoint.h
+++ b/mfbt/FloatingPoint.h
@@ -15,7 +15,6 @@
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/MemoryChecking.h"
 #include "mozilla/Types.h"
-#include "mozilla/TypeTraits.h"
 
 #include <limits>
 #include <stdint.h>
diff --git a/mfbt/IntegerRange.h b/mfbt/IntegerRange.h
index 1b339e49af12f..9d6720192d27c 100644
--- a/mfbt/IntegerRange.h
+++ b/mfbt/IntegerRange.h
@@ -11,7 +11,6 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/ReverseIterator.h"
-#include "mozilla/TypeTraits.h"
 
 #include <type_traits>
 
diff --git a/mfbt/IntegerTypeTraits.h b/mfbt/IntegerTypeTraits.h
index 917c0f6116969..57c5c4103c6c1 100644
--- a/mfbt/IntegerTypeTraits.h
+++ b/mfbt/IntegerTypeTraits.h
@@ -9,7 +9,7 @@
 #ifndef mozilla_IntegerTypeTraits_h
 #define mozilla_IntegerTypeTraits_h
 
-#include "mozilla/TypeTraits.h"
+#include <stddef.h>
 #include <stdint.h>
 #include <type_traits>
 
diff --git a/mfbt/Latin1.h b/mfbt/Latin1.h
index f7593f77838b2..5609955c22cb0 100644
--- a/mfbt/Latin1.h
+++ b/mfbt/Latin1.h
@@ -17,7 +17,6 @@
 #include "mozilla/JsRust.h"
 #include "mozilla/Span.h"
 #include "mozilla/Tuple.h"
-#include "mozilla/TypeTraits.h"
 
 #if MOZ_HAS_JSRUST()
 #  include "encoding_rs_mem.h"
diff --git a/mfbt/MathAlgorithms.h b/mfbt/MathAlgorithms.h
index d77434a986fb7..f635a08e5df13 100644
--- a/mfbt/MathAlgorithms.h
+++ b/mfbt/MathAlgorithms.h
@@ -10,7 +10,6 @@
 #define mozilla_MathAlgorithms_h
 
 #include "mozilla/Assertions.h"
-#include "mozilla/TypeTraits.h"
 
 #include <cmath>
 #include <limits.h>
diff --git a/mfbt/Maybe.h b/mfbt/Maybe.h
index ff57c93f90032..82d0ba8428429 100644
--- a/mfbt/Maybe.h
+++ b/mfbt/Maybe.h
@@ -20,7 +20,6 @@
 #include "mozilla/MemoryChecking.h"
 #include "mozilla/OperatorNewExtensions.h"
 #include "mozilla/Poison.h"
-#include "mozilla/TypeTraits.h"
 
 class nsCycleCollectionTraversalCallback;
 
diff --git a/mfbt/NonDereferenceable.h b/mfbt/NonDereferenceable.h
index c1dc4989efaca..30c4cac853e9c 100644
--- a/mfbt/NonDereferenceable.h
+++ b/mfbt/NonDereferenceable.h
@@ -10,7 +10,6 @@
 /* A pointer wrapper indicating that the pointer should not be dereferenced. */
 
 #include "mozilla/Attributes.h"
-#include "mozilla/TypeTraits.h"
 
 #include <cstdint>
 
diff --git a/mfbt/NotNull.h b/mfbt/NotNull.h
index ab8feb5bea1be..7ea799784f186 100644
--- a/mfbt/NotNull.h
+++ b/mfbt/NotNull.h
@@ -68,7 +68,6 @@
 #include <utility>
 
 #include "mozilla/Assertions.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 
diff --git a/mfbt/Range.h b/mfbt/Range.h
index e8a8c4b40cb76..5139823bc9e82 100644
--- a/mfbt/Range.h
+++ b/mfbt/Range.h
@@ -8,7 +8,6 @@
 #define mozilla_Range_h
 
 #include "mozilla/RangedPtr.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/Span.h"
 
 #include <stddef.h>
diff --git a/mfbt/RefCounted.h b/mfbt/RefCounted.h
index 9b47c9243ca3b..439bcf3e4af3b 100644
--- a/mfbt/RefCounted.h
+++ b/mfbt/RefCounted.h
@@ -17,7 +17,6 @@
 #include "mozilla/Atomics.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/RefCountType.h"
-#include "mozilla/TypeTraits.h"
 
 #if defined(MOZILLA_INTERNAL_API)
 #  include "nsXPCOM.h"
diff --git a/mfbt/Result.h b/mfbt/Result.h
index 9b47a7fb80935..61716eec20461 100644
--- a/mfbt/Result.h
+++ b/mfbt/Result.h
@@ -14,7 +14,6 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Types.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/Variant.h"
 
 namespace mozilla {
diff --git a/mfbt/ReverseIterator.h b/mfbt/ReverseIterator.h
index 7486c08b993e9..dee2e7318caea 100644
--- a/mfbt/ReverseIterator.h
+++ b/mfbt/ReverseIterator.h
@@ -14,7 +14,6 @@
 #include <utility>
 
 #include "mozilla/Attributes.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 
diff --git a/mfbt/RollingMean.h b/mfbt/RollingMean.h
index ba65a31bbe719..137b07eb98789 100644
--- a/mfbt/RollingMean.h
+++ b/mfbt/RollingMean.h
@@ -10,7 +10,6 @@
 #define mozilla_RollingMean_h_
 
 #include "mozilla/Assertions.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/Vector.h"
 
 #include <stddef.h>
diff --git a/mfbt/Saturate.h b/mfbt/Saturate.h
index 9bbbbb4d4dbec..777e326934a78 100644
--- a/mfbt/Saturate.h
+++ b/mfbt/Saturate.h
@@ -10,11 +10,11 @@
 #define mozilla_Saturate_h
 
 #include <limits>
+#include <stdint.h>
 #include <type_traits>
 #include <utility>
 
 #include "mozilla/Attributes.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 namespace detail {
diff --git a/mfbt/SegmentedVector.h b/mfbt/SegmentedVector.h
index dab3eac996825..71732b10b6dc8 100644
--- a/mfbt/SegmentedVector.h
+++ b/mfbt/SegmentedVector.h
@@ -29,7 +29,6 @@
 #include "mozilla/LinkedList.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/OperatorNewExtensions.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 
diff --git a/mfbt/Span.h b/mfbt/Span.h
index 545f3461bdc64..ac4c6c9d07a5b 100644
--- a/mfbt/Span.h
+++ b/mfbt/Span.h
@@ -34,7 +34,6 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Casting.h"
 #include "mozilla/IntegerTypeTraits.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/UniquePtr.h"
 
 namespace mozilla {
diff --git a/mfbt/TextUtils.h b/mfbt/TextUtils.h
index b8e6855a47915..382b3ed9e3991 100644
--- a/mfbt/TextUtils.h
+++ b/mfbt/TextUtils.h
@@ -11,7 +11,6 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Latin1.h"
-#include "mozilla/TypeTraits.h"
 
 #ifdef MOZ_HAS_JSRUST
 // Can't include mozilla/Encoding.h here.
diff --git a/mfbt/ThreadLocal.h b/mfbt/ThreadLocal.h
index fef615e382da7..a07a734a16828 100644
--- a/mfbt/ThreadLocal.h
+++ b/mfbt/ThreadLocal.h
@@ -17,7 +17,6 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 
diff --git a/mfbt/ThreadSafeWeakPtr.h b/mfbt/ThreadSafeWeakPtr.h
index 1dee330f74066..9384bf19eddc8 100644
--- a/mfbt/ThreadSafeWeakPtr.h
+++ b/mfbt/ThreadSafeWeakPtr.h
@@ -61,7 +61,6 @@
 #include "mozilla/Atomics.h"
 #include "mozilla/RefCounted.h"
 #include "mozilla/RefPtr.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/Unused.h"
 
 #include <limits>
diff --git a/mfbt/Tuple.h b/mfbt/Tuple.h
index b4d794d0253cb..33342a09ea3c7 100644
--- a/mfbt/Tuple.h
+++ b/mfbt/Tuple.h
@@ -16,7 +16,6 @@
 
 #include "mozilla/CompactPair.h"
 #include "mozilla/TemplateLib.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 
diff --git a/mfbt/UniquePtr.h b/mfbt/UniquePtr.h
index e6279cd43ba94..6ea795a4ca516 100644
--- a/mfbt/UniquePtr.h
+++ b/mfbt/UniquePtr.h
@@ -16,7 +16,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/CompactPair.h"
 #include "mozilla/Compiler.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 
diff --git a/mfbt/Variant.h b/mfbt/Variant.h
index b33ba60eb2e98..9f4d3d970efa5 100644
--- a/mfbt/Variant.h
+++ b/mfbt/Variant.h
@@ -14,7 +14,6 @@
 #include "mozilla/HashFunctions.h"
 #include "mozilla/OperatorNewExtensions.h"
 #include "mozilla/TemplateLib.h"
-#include "mozilla/TypeTraits.h"
 #include <type_traits>
 #include <utility>
 
diff --git a/mfbt/WeakPtr.h b/mfbt/WeakPtr.h
index 8b54840bd3250..44fa36a10f38c 100644
--- a/mfbt/WeakPtr.h
+++ b/mfbt/WeakPtr.h
@@ -73,7 +73,6 @@
 #include "mozilla/Maybe.h"
 #include "mozilla/RefCounted.h"
 #include "mozilla/RefPtr.h"
-#include "mozilla/TypeTraits.h"
 
 #include <string.h>
 #include <type_traits>
diff --git a/mfbt/WrappingOperations.h b/mfbt/WrappingOperations.h
index 5138e011f2523..bd67ac34f1889 100644
--- a/mfbt/WrappingOperations.h
+++ b/mfbt/WrappingOperations.h
@@ -25,7 +25,6 @@
 #define mozilla_WrappingOperations_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/TypeTraits.h"
 
 #include <limits.h>
 #include <type_traits>
diff --git a/mfbt/tests/TestCompactPair.cpp b/mfbt/tests/TestCompactPair.cpp
index fe44e080d41f2..2d7cf859a1c1d 100644
--- a/mfbt/tests/TestCompactPair.cpp
+++ b/mfbt/tests/TestCompactPair.cpp
@@ -7,7 +7,6 @@
 #include <type_traits>
 
 #include "mozilla/CompactPair.h"
-#include "mozilla/TypeTraits.h"
 
 using mozilla::CompactPair;
 using mozilla::MakeCompactPair;
diff --git a/mfbt/tests/TestMaybe.cpp b/mfbt/tests/TestMaybe.cpp
index 24399054b02b9..a65ebf4c81d60 100644
--- a/mfbt/tests/TestMaybe.cpp
+++ b/mfbt/tests/TestMaybe.cpp
@@ -11,7 +11,6 @@
 #include "mozilla/Compiler.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/TemplateLib.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/Types.h"
 #include "mozilla/UniquePtr.h"
 
diff --git a/mfbt/tests/TestTuple.cpp b/mfbt/tests/TestTuple.cpp
index fd2feede9bb6d..735354847d95a 100644
--- a/mfbt/tests/TestTuple.cpp
+++ b/mfbt/tests/TestTuple.cpp
@@ -12,7 +12,6 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/CompactPair.h"
 #include "mozilla/Tuple.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Unused.h"
 
diff --git a/mfbt/tests/TestUniquePtr.cpp b/mfbt/tests/TestUniquePtr.cpp
index bc0d5140a0970..1000b1caf3c16 100644
--- a/mfbt/tests/TestUniquePtr.cpp
+++ b/mfbt/tests/TestUniquePtr.cpp
@@ -11,7 +11,6 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Compiler.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/UniquePtrExtensions.h"
 #include "mozilla/Vector.h"
diff --git a/mfbt/tests/gtest/TestSpan.cpp b/mfbt/tests/gtest/TestSpan.cpp
index 0ac9d5c908b71..3637eafdc973e 100644
--- a/mfbt/tests/gtest/TestSpan.cpp
+++ b/mfbt/tests/gtest/TestSpan.cpp
@@ -24,7 +24,6 @@
 #include "nsString.h"
 #include "nsTArray.h"
 #include "mozilla/Range.h"
-#include "mozilla/TypeTraits.h"
 
 #include <type_traits>
 
diff --git a/mozglue/dllservices/Authenticode.cpp b/mozglue/dllservices/Authenticode.cpp
index d46a0cb4bd689..55ce487f20aa8 100644
--- a/mozglue/dllservices/Authenticode.cpp
+++ b/mozglue/dllservices/Authenticode.cpp
@@ -20,7 +20,6 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/DynamicallyLinkedFunctionPtr.h"
 #include "mozilla/ScopeExit.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/WindowsVersion.h"
 #include "nsWindowsHelpers.h"
diff --git a/mozglue/misc/TimeStamp.h b/mozglue/misc/TimeStamp.h
index 6cc760dc89cd1..9b2521955fc97 100644
--- a/mozglue/misc/TimeStamp.h
+++ b/mozglue/misc/TimeStamp.h
@@ -14,7 +14,6 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/FloatingPoint.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/Types.h"
 
 namespace IPC {
diff --git a/mozglue/misc/interceptor/Arm64.h b/mozglue/misc/interceptor/Arm64.h
index 53495d7ab8f20..ebb30ecd6b223 100644
--- a/mozglue/misc/interceptor/Arm64.h
+++ b/mozglue/misc/interceptor/Arm64.h
@@ -16,7 +16,6 @@
 #include "mozilla/Result.h"
 #include "mozilla/Saturate.h"
 #include "mozilla/Types.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 namespace interceptor {
diff --git a/mozglue/misc/nsWindowsDllInterceptor.h b/mozglue/misc/nsWindowsDllInterceptor.h
index a6fc57565975a..736e03c298703 100644
--- a/mozglue/misc/nsWindowsDllInterceptor.h
+++ b/mozglue/misc/nsWindowsDllInterceptor.h
@@ -21,7 +21,6 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/NativeNt.h"
 #include "mozilla/Tuple.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/Types.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Vector.h"
diff --git a/mozglue/tests/interceptor/TestDllInterceptor.cpp b/mozglue/tests/interceptor/TestDllInterceptor.cpp
index 13230124d7f3e..29a906d0d40e1 100644
--- a/mozglue/tests/interceptor/TestDllInterceptor.cpp
+++ b/mozglue/tests/interceptor/TestDllInterceptor.cpp
@@ -16,7 +16,6 @@
 
 #include "AssemblyPayloads.h"
 #include "mozilla/DynamicallyLinkedFunctionPtr.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/WindowsVersion.h"
 #include "nsWindowsDllInterceptor.h"
diff --git a/toolkit/components/telemetry/build_scripts/gen_histogram_enum.py b/toolkit/components/telemetry/build_scripts/gen_histogram_enum.py
index 8486a2ccdc2d8..11c7dbcae9db2 100644
--- a/toolkit/components/telemetry/build_scripts/gen_histogram_enum.py
+++ b/toolkit/components/telemetry/build_scripts/gen_histogram_enum.py
@@ -29,7 +29,6 @@
 #define mozilla_TelemetryHistogramEnums_h
 
 #include "mozilla/TemplateLib.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 namespace Telemetry {
diff --git a/toolkit/crashreporter/ThreadAnnotation.cpp b/toolkit/crashreporter/ThreadAnnotation.cpp
index 999608ba4797f..945e48be96582 100644
--- a/toolkit/crashreporter/ThreadAnnotation.cpp
+++ b/toolkit/crashreporter/ThreadAnnotation.cpp
@@ -8,7 +8,6 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/StaticMutex.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/UniquePtr.h"
 
 #include "prthread.h"
diff --git a/toolkit/xre/ModuleEvaluator.cpp b/toolkit/xre/ModuleEvaluator.cpp
index c903b3ec41d97..d62043e6c8ff0 100644
--- a/toolkit/xre/ModuleEvaluator.cpp
+++ b/toolkit/xre/ModuleEvaluator.cpp
@@ -14,7 +14,6 @@
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/ModuleVersionInfo.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Unused.h"
 #include "mozilla/WinDllServices.h"
diff --git a/tools/fuzzing/common/FuzzingMutate.h b/tools/fuzzing/common/FuzzingMutate.h
index 6248d973ee45a..f24f557669256 100644
--- a/tools/fuzzing/common/FuzzingMutate.h
+++ b/tools/fuzzing/common/FuzzingMutate.h
@@ -7,7 +7,6 @@
 #ifndef mozilla_fuzzing_FuzzingMutate_h
 #define mozilla_fuzzing_FuzzingMutate_h
 
-#include "mozilla/TypeTraits.h"
 #include <random>
 
 namespace mozilla {
diff --git a/tools/fuzzing/common/FuzzingTraits.h b/tools/fuzzing/common/FuzzingTraits.h
index e63569537873d..b8c9d76ab7431 100644
--- a/tools/fuzzing/common/FuzzingTraits.h
+++ b/tools/fuzzing/common/FuzzingTraits.h
@@ -8,7 +8,6 @@
 #define mozilla_fuzzing_FuzzingTraits_h
 
 #include "mozilla/Assertions.h"
-#include "mozilla/TypeTraits.h"
 #include <cmath>
 #include <random>
 #include <type_traits>
diff --git a/tools/fuzzing/faulty/Faulty.cpp b/tools/fuzzing/faulty/Faulty.cpp
index 8509caea72497..833c0697bc6a8 100644
--- a/tools/fuzzing/faulty/Faulty.cpp
+++ b/tools/fuzzing/faulty/Faulty.cpp
@@ -24,7 +24,6 @@
 #include "chrome/common/ipc_message.h"
 #include "chrome/common/file_descriptor_set_posix.h"
 #include "mozilla/ipc/Faulty.h"
-#include "mozilla/TypeTraits.h"
 #include "nsComponentManagerUtils.h"
 #include "nsNetCID.h"
 #include "nsIFile.h"
diff --git a/tools/profiler/core/platform.cpp b/tools/profiler/core/platform.cpp
index 630716a07e38e..a2da8c79d4a9e 100644
--- a/tools/profiler/core/platform.cpp
+++ b/tools/profiler/core/platform.cpp
@@ -57,7 +57,6 @@
 #include "mozilla/SystemGroup.h"
 #include "mozilla/ThreadLocal.h"
 #include "mozilla/TimeStamp.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/Tuple.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Vector.h"
diff --git a/widget/SystemTimeConverter.h b/widget/SystemTimeConverter.h
index 7f77eeafa1300..92fd61899f51e 100644
--- a/widget/SystemTimeConverter.h
+++ b/widget/SystemTimeConverter.h
@@ -9,7 +9,6 @@
 #include <limits>
 #include <type_traits>
 #include "mozilla/TimeStamp.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 
diff --git a/widget/android/nsAppShell.h b/widget/android/nsAppShell.h
index 3a9a5c0ca603f..fbd85e9827728 100644
--- a/widget/android/nsAppShell.h
+++ b/widget/android/nsAppShell.h
@@ -16,7 +16,6 @@
 #include "mozilla/Monitor.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/TimeStamp.h"  // for mozilla::TimeDuration
-#include "mozilla/TypeTraits.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Unused.h"
 #include "mozilla/jni/Natives.h"
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index 365a7d9d55610..33a2ab6874f37 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -19,7 +19,6 @@
 #include "mozilla/StaticPrefs_android.h"
 #include "mozilla/StaticPrefs_ui.h"
 #include "mozilla/TouchEvents.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/Unused.h"
 #include "mozilla/WeakPtr.h"
 #include "mozilla/WheelHandlingHelper.h"  // for WheelDeltaAdjustmentStrategy
diff --git a/widget/windows/ShellHeaderOnlyUtils.h b/widget/windows/ShellHeaderOnlyUtils.h
index fb87e72d41814..11849c99cc902 100644
--- a/widget/windows/ShellHeaderOnlyUtils.h
+++ b/widget/windows/ShellHeaderOnlyUtils.h
@@ -26,7 +26,6 @@
 #include <comutil.h>
 
 #include "mozilla/RefPtr.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/UniquePtr.h"
 
 namespace mozilla {
diff --git a/xpcom/base/HoldDropJSObjects.h b/xpcom/base/HoldDropJSObjects.h
index 31c892d2527cb..eb1b65eae137a 100644
--- a/xpcom/base/HoldDropJSObjects.h
+++ b/xpcom/base/HoldDropJSObjects.h
@@ -7,7 +7,6 @@
 #ifndef mozilla_HoldDropJSObjects_h
 #define mozilla_HoldDropJSObjects_h
 
-#include "mozilla/TypeTraits.h"
 #include "nsCycleCollectionParticipant.h"
 
 class nsISupports;
diff --git a/xpcom/base/nsCOMPtr.h b/xpcom/base/nsCOMPtr.h
index 51585447553b1..8178e6fc04140 100644
--- a/xpcom/base/nsCOMPtr.h
+++ b/xpcom/base/nsCOMPtr.h
@@ -27,7 +27,6 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/RefPtr.h"
-#include "mozilla/TypeTraits.h"
 #include "nsCycleCollectionNoteChild.h"
 #include "nsDebug.h"  // for |NS_ASSERTION|
 #include "nsISupportsUtils.h"  // for |nsresult|, |NS_ADDREF|, |NS_GET_TEMPLATE_IID| et al
diff --git a/xpcom/base/nsCycleCollectionNoteChild.h b/xpcom/base/nsCycleCollectionNoteChild.h
index ba4d1cf2d8b18..3e1d345aa31cf 100644
--- a/xpcom/base/nsCycleCollectionNoteChild.h
+++ b/xpcom/base/nsCycleCollectionNoteChild.h
@@ -13,7 +13,6 @@
 
 #include "nsCycleCollectionTraversalCallback.h"
 #include "mozilla/Likely.h"
-#include "mozilla/TypeTraits.h"
 
 enum { CycleCollectionEdgeNameArrayFlag = 1 };
 
diff --git a/xpcom/base/nsISupportsUtils.h b/xpcom/base/nsISupportsUtils.h
index ee0344f1872e8..07197d9fdc472 100644
--- a/xpcom/base/nsISupportsUtils.h
+++ b/xpcom/base/nsISupportsUtils.h
@@ -15,7 +15,6 @@
 #include "nsDebug.h"
 #include "nsISupportsImpl.h"
 #include "mozilla/RefPtr.h"
-#include "mozilla/TypeTraits.h"
 
 /**
  * Macro for adding a reference to an interface.
diff --git a/xpcom/ds/ArrayIterator.h b/xpcom/ds/ArrayIterator.h
index 88dbdca174f4f..cc6c8d1cb449c 100644
--- a/xpcom/ds/ArrayIterator.h
+++ b/xpcom/ds/ArrayIterator.h
@@ -12,8 +12,6 @@
 #include <iterator>
 #include <type_traits>
 
-#include "mozilla/TypeTraits.h"
-
 namespace mozilla {
 
 namespace detail {
diff --git a/xpcom/ds/Tokenizer.h b/xpcom/ds/Tokenizer.h
index 0f8cb3fe55ebd..ec142100432bf 100644
--- a/xpcom/ds/Tokenizer.h
+++ b/xpcom/ds/Tokenizer.h
@@ -12,7 +12,6 @@
 #include "nsString.h"
 #include "mozilla/CheckedInt.h"
 #include "mozilla/ScopeExit.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/UniquePtr.h"
 #include "nsTArray.h"
 
diff --git a/xpcom/ds/nsTHashtable.h b/xpcom/ds/nsTHashtable.h
index 8ebb83c9f13cd..e642958c0726b 100644
--- a/xpcom/ds/nsTHashtable.h
+++ b/xpcom/ds/nsTHashtable.h
@@ -20,7 +20,6 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/OperatorNewExtensions.h"
 #include "mozilla/PodOperations.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/fallible.h"
 #include "nsPointerHashKeys.h"
 
diff --git a/xpcom/reflect/xptinfo/xptcodegen.py b/xpcom/reflect/xptinfo/xptcodegen.py
index e837b933b53bb..19dfda54983f1 100644
--- a/xpcom/reflect/xptinfo/xptcodegen.py
+++ b/xpcom/reflect/xptinfo/xptcodegen.py
@@ -460,7 +460,6 @@ def lower_iface(iface):
     fd.write("""
 #include "xptinfo.h"
 #include "mozilla/PerfectHash.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/dom/BindingUtils.h"
 
 // These template methods are specialized to be used in the sDOMObjects table.
diff --git a/xpcom/string/nsTextFormatter.h b/xpcom/string/nsTextFormatter.h
index 2ac2e96ee0772..f55945c04045a 100644
--- a/xpcom/string/nsTextFormatter.h
+++ b/xpcom/string/nsTextFormatter.h
@@ -35,7 +35,6 @@
 #include "nscore.h"
 #include "nsString.h"
 #include "mozilla/Span.h"
-#include "mozilla/TypeTraits.h"
 
 #ifdef XPCOM_GLUE
 #  error \
diff --git a/xpcom/string/nsUTF8Utils.h b/xpcom/string/nsUTF8Utils.h
index 56e1567da7c97..92dca257ded80 100644
--- a/xpcom/string/nsUTF8Utils.h
+++ b/xpcom/string/nsUTF8Utils.h
@@ -15,7 +15,6 @@
 #include "nscore.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/EndianUtils.h"
-#include "mozilla/TypeTraits.h"
 
 #include "nsCharTraits.h"
 
diff --git a/xpcom/tests/gtest/TestNsDeque.cpp b/xpcom/tests/gtest/TestNsDeque.cpp
index a9fd3fbecf7af..f34187626ce64 100644
--- a/xpcom/tests/gtest/TestNsDeque.cpp
+++ b/xpcom/tests/gtest/TestNsDeque.cpp
@@ -7,7 +7,6 @@
 #include "gtest/gtest.h"
 #include "nsDeque.h"
 #include "nsCRT.h"
-#include "mozilla/TypeTraits.h"
 #include <stdio.h>
 #include <functional>
 #include <type_traits>
diff --git a/xpcom/threads/MozPromise.h b/xpcom/threads/MozPromise.h
index 302266a9e6f89..84654e7d509a0 100644
--- a/xpcom/threads/MozPromise.h
+++ b/xpcom/threads/MozPromise.h
@@ -16,7 +16,6 @@
 #  include "mozilla/Mutex.h"
 #  include "mozilla/RefPtr.h"
 #  include "mozilla/Tuple.h"
-#  include "mozilla/TypeTraits.h"
 #  include "mozilla/UniquePtr.h"
 #  include "mozilla/Variant.h"
 
diff --git a/xpcom/threads/PrioritizedEventQueue.h b/xpcom/threads/PrioritizedEventQueue.h
index 2571d38a8a37f..3d39a37fb8280 100644
--- a/xpcom/threads/PrioritizedEventQueue.h
+++ b/xpcom/threads/PrioritizedEventQueue.h
@@ -11,7 +11,6 @@
 #include "mozilla/EventQueue.h"
 #include "mozilla/IdlePeriodState.h"
 #include "mozilla/TimeStamp.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/UniquePtr.h"
 #include "nsCOMPtr.h"
 
diff --git a/xpcom/threads/nsProxyRelease.h b/xpcom/threads/nsProxyRelease.h
index c4628d7539fcb..b36b4339f8ba9 100644
--- a/xpcom/threads/nsProxyRelease.h
+++ b/xpcom/threads/nsProxyRelease.h
@@ -12,7 +12,6 @@
 #include "MainThreadUtils.h"
 #include "mozilla/Likely.h"
 #include "mozilla/SystemGroup.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/Unused.h"
 #include "nsCOMPtr.h"
 #include "nsIEventTarget.h"
diff --git a/xpcom/threads/nsThreadUtils.h b/xpcom/threads/nsThreadUtils.h
index aa33f5c7bc3a6..80c43b3a5bee3 100644
--- a/xpcom/threads/nsThreadUtils.h
+++ b/xpcom/threads/nsThreadUtils.h
@@ -17,7 +17,6 @@
 #include "mozilla/Maybe.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/Tuple.h"
-#include "mozilla/TypeTraits.h"
 #include "nsCOMPtr.h"
 #include "nsICancelableRunnable.h"
 #include "nsIIdlePeriod.h"