Bug 1625138 - Part 41: Remove no longer needed includes for mozilla/TypeTraits. r=froydnj

Also adds missing includes in some files, these were previously only transivitely
included through mozilla/TypeTraits.h.

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

--HG--
extra : moz-landing-system : lando

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 {

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

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"

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"

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"

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"
 

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"

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"

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

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>

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"

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"
 

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"
 

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"

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"

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 {

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 {

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"
 

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>

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

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"
 

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;

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 {
 

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>
 

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"
 

mfbt/Casting.h

@@ -10,7 +10,6 @@
 #define mozilla_Casting_h
 
 #include "mozilla/Assertions.h"
-#include "mozilla/TypeTraits.h"
 
 #include <cstring>
 #include <limits.h>

mfbt/CompactPair.h

@@ -13,7 +13,6 @@
 #include <utility>
 
 #include "mozilla/Attributes.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 

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>

mfbt/EnumTypeTraits.h

@@ -8,6 +8,7 @@
 #ifndef mozilla_EnumTypeTraits_h
 #define mozilla_EnumTypeTraits_h
 
+#include <stddef.h>
 #include <type_traits>
 
 namespace mozilla {

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>

mfbt/IntegerRange.h

@@ -11,7 +11,6 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/ReverseIterator.h"
-#include "mozilla/TypeTraits.h"
 
 #include <type_traits>
 

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>
 

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"

mfbt/MathAlgorithms.h

@@ -10,7 +10,6 @@
 #define mozilla_MathAlgorithms_h
 
 #include "mozilla/Assertions.h"
-#include "mozilla/TypeTraits.h"
 
 #include <cmath>
 #include <limits.h>

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;
 

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>
 

mfbt/NotNull.h

@@ -68,7 +68,6 @@
 #include <utility>
 
 #include "mozilla/Assertions.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 

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>

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"

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 {

mfbt/ReverseIterator.h

@@ -14,7 +14,6 @@
 #include <utility>
 
 #include "mozilla/Attributes.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 

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>

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 {

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 {
 

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 {

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.

mfbt/ThreadLocal.h

@@ -17,7 +17,6 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 

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>

mfbt/Tuple.h

@@ -16,7 +16,6 @@
 
 #include "mozilla/CompactPair.h"
 #include "mozilla/TemplateLib.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 

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 {
 

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>
 

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>

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>

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;

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"
 

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"
 

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"

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>
 

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"

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 {

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 {

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"

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"

toolkit/components/telemetry/build_scripts/gen_histogram_enum.py

@@ -29,7 +29,6 @@ header = """
 #define mozilla_TelemetryHistogramEnums_h
 
 #include "mozilla/TemplateLib.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 namespace Telemetry {

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"

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"

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 {

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>

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"

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"

widget/SystemTimeConverter.h

@@ -9,7 +9,6 @@
 #include <limits>
 #include <type_traits>
 #include "mozilla/TimeStamp.h"
-#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 

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"

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

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 {

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;

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

xpcom/base/nsCycleCollectionNoteChild.h

@@ -13,7 +13,6 @@
 
 #include "nsCycleCollectionTraversalCallback.h"
 #include "mozilla/Likely.h"
-#include "mozilla/TypeTraits.h"
 
 enum { CycleCollectionEdgeNameArrayFlag = 1 };
 

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.

xpcom/ds/ArrayIterator.h

@@ -12,8 +12,6 @@
 #include <iterator>
 #include <type_traits>
 
-#include "mozilla/TypeTraits.h"
-
 namespace mozilla {
 
 namespace detail {

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"
 

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"
 

xpcom/reflect/xptinfo/xptcodegen.py

@@ -460,7 +460,6 @@ def link_to_cpp(interfaces, fd):
     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.

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 \

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"
 

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>

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"
 

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"
 

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"

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"