https://github.com/kazutakahirata created
https://github.com/llvm/llvm-project/pull/141420
These are identified by misc-include-cleaner. I've filtered out those
that break builds. Also, I'm staying away from llvm-config.h,
config.h, and Compiler.h, which likely cause platform- or
compiler-specific build failures.
>From 7acd16c816956930b76b8f1f56b4c72340af90cd Mon Sep 17 00:00:00 2001
From: Kazu Hirata <k...@google.com>
Date: Sat, 24 May 2025 23:27:06 -0700
Subject: [PATCH] [clang-tidy] Remove unused includes (NFC)
These are identified by misc-include-cleaner. I've filtered out those
that break builds. Also, I'm staying away from llvm-config.h,
config.h, and Compiler.h, which likely cause platform- or
compiler-specific build failures.
---
clang-tools-extra/clang-tidy/ClangTidy.cpp | 4 ----
clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp | 1 -
clang-tools-extra/clang-tidy/ClangTidyOptions.cpp | 2 --
clang-tools-extra/clang-tidy/NoLintDirectiveHandler.cpp | 2 --
clang-tools-extra/clang-tidy/abseil/CleanupCtadCheck.cpp | 3 ---
.../clang-tidy/abseil/DurationComparisonCheck.cpp | 2 --
.../clang-tidy/abseil/DurationFactoryFloatCheck.cpp | 1 -
.../clang-tidy/abseil/NoInternalDependenciesCheck.cpp | 1 -
clang-tools-extra/clang-tidy/abseil/NoNamespaceCheck.cpp | 1 -
.../clang-tidy/abseil/StringFindStrContainsCheck.cpp | 1 -
clang-tools-extra/clang-tidy/abseil/TimeComparisonCheck.cpp | 2 --
clang-tools-extra/clang-tidy/abseil/TimeSubtractionCheck.cpp | 1 -
.../clang-tidy/altera/KernelNameRestrictionCheck.cpp | 1 -
clang-tools-extra/clang-tidy/android/CloexecAccept4Check.cpp | 2 --
clang-tools-extra/clang-tidy/android/CloexecAcceptCheck.cpp | 1 -
clang-tools-extra/clang-tidy/android/CloexecCreatCheck.cpp | 1 -
clang-tools-extra/clang-tidy/android/CloexecDupCheck.cpp | 1 -
.../clang-tidy/android/CloexecEpollCreate1Check.cpp | 2 --
.../clang-tidy/android/CloexecEpollCreateCheck.cpp | 1 -
clang-tools-extra/clang-tidy/android/CloexecFopenCheck.cpp | 3 ---
.../clang-tidy/android/CloexecInotifyInit1Check.cpp | 2 --
.../clang-tidy/android/CloexecInotifyInitCheck.cpp | 1 -
clang-tools-extra/clang-tidy/android/CloexecOpenCheck.cpp | 1 -
clang-tools-extra/clang-tidy/android/CloexecPipe2Check.cpp | 2 --
clang-tools-extra/clang-tidy/android/CloexecPipeCheck.cpp | 1 -
clang-tools-extra/clang-tidy/android/CloexecSocketCheck.cpp | 1 -
.../clang-tidy/android/ComparisonInTempFailureRetryCheck.cpp | 1 -
.../clang-tidy/bugprone/AssertSideEffectCheck.cpp | 2 --
clang-tools-extra/clang-tidy/bugprone/BranchCloneCheck.cpp | 1 -
.../bugprone/ComparePointerToMemberVirtualFunctionCheck.cpp | 2 --
clang-tools-extra/clang-tidy/bugprone/EmptyCatchCheck.cpp | 1 -
.../clang-tidy/bugprone/ExceptionEscapeCheck.cpp | 2 --
.../clang-tidy/bugprone/ForwardDeclarationNamespaceCheck.cpp | 1 -
.../clang-tidy/bugprone/InaccurateEraseCheck.cpp | 1 -
.../clang-tidy/bugprone/IncorrectRoundingsCheck.cpp | 3 ---
.../clang-tidy/bugprone/IntegerDivisionCheck.cpp | 1 -
.../clang-tidy/bugprone/MisplacedWideningCastCheck.cpp | 1 -
.../clang-tidy/bugprone/MoveForwardingReferenceCheck.cpp | 3 ---
.../clang-tidy/bugprone/NarrowingConversionsCheck.cpp | 1 -
.../bugprone/NondeterministicPointerIterationOrderCheck.cpp | 1 -
.../clang-tidy/bugprone/ParentVirtualCallCheck.cpp | 1 -
.../clang-tidy/bugprone/ReservedIdentifierCheck.cpp | 2 --
.../clang-tidy/bugprone/SizeofContainerCheck.cpp | 1 -
.../clang-tidy/bugprone/StandaloneEmptyCheck.cpp | 2 --
.../clang-tidy/bugprone/StringviewNullptrCheck.cpp | 2 --
.../clang-tidy/bugprone/SuspiciousReallocUsageCheck.cpp | 2 --
.../clang-tidy/bugprone/SuspiciousStringCompareCheck.cpp | 1 -
.../clang-tidy/bugprone/SwitchMissingDefaultCaseCheck.cpp | 1 -
.../clang-tidy/bugprone/TerminatingContinueCheck.cpp | 1 -
.../clang-tidy/bugprone/UndelegatedConstructorCheck.cpp | 1 -
.../clang-tidy/bugprone/UnhandledExceptionAtNewCheck.cpp | 1 -
.../clang-tidy/bugprone/UnusedReturnValueCheck.cpp | 1 -
clang-tools-extra/clang-tidy/cert/CommandProcessorCheck.cpp | 1 -
.../clang-tidy/cert/DontModifyStdNamespaceCheck.cpp | 1 -
.../clang-tidy/cert/NonTrivialTypesLibcMemoryCallsCheck.cpp | 2 --
.../clang-tidy/cert/StaticObjectExceptionCheck.cpp | 1 -
.../clang-tidy/cert/ThrownExceptionTypeCheck.cpp | 1 -
.../clang-tidy/cert/VariadicFunctionDefCheck.cpp | 1 -
clang-tools-extra/clang-tidy/concurrency/MtUnsafeCheck.cpp | 1 -
.../concurrency/ThreadCanceltypeAsynchronousCheck.cpp | 1 -
.../clang-tidy/cppcoreguidelines/AvoidDoWhileCheck.cpp | 1 -
.../clang-tidy/cppcoreguidelines/AvoidGotoCheck.cpp | 1 -
.../AvoidReferenceCoroutineParametersCheck.cpp | 1 -
.../cppcoreguidelines/InterfacesGlobalInitCheck.cpp | 1 -
.../clang-tidy/cppcoreguidelines/NoMallocCheck.cpp | 5 -----
.../clang-tidy/cppcoreguidelines/OwningMemoryCheck.cpp | 2 --
.../cppcoreguidelines/ProTypeReinterpretCastCheck.cpp | 1 -
.../clang-tidy/cppcoreguidelines/ProTypeUnionAccessCheck.cpp | 1 -
.../cppcoreguidelines/SpecialMemberFunctionsCheck.cpp | 1 -
clang-tools-extra/clang-tidy/darwin/AvoidSpinlockCheck.cpp | 1 -
clang-tools-extra/clang-tidy/fuchsia/TrailingReturnCheck.cpp | 1 -
.../clang-tidy/google/AvoidThrowingObjCExceptionCheck.cpp | 1 -
.../google/AvoidUnderscoreInGoogletestNameCheck.cpp | 1 -
clang-tools-extra/clang-tidy/google/FunctionNamingCheck.cpp | 1 -
.../clang-tidy/google/GlobalNamesInHeadersCheck.cpp | 1 -
.../clang-tidy/google/GlobalVariableDeclarationCheck.cpp | 1 -
.../clang-tidy/google/OverloadedUnaryAndCheck.cpp | 1 -
.../clang-tidy/google/UnnamedNamespaceInHeaderCheck.cpp | 1 -
.../clang-tidy/google/UsingNamespaceDirectiveCheck.cpp | 1 -
clang-tools-extra/clang-tidy/hicpp/HICPPTidyModule.cpp | 1 -
clang-tools-extra/clang-tidy/hicpp/NoAssemblerCheck.cpp | 1 -
.../clang-tidy/linuxkernel/MustCheckErrsCheck.cpp | 1 -
.../clang-tidy/llvm/PreferRegisterOverUnsignedCheck.cpp | 1 -
.../clang-tidy/llvmlibc/CalleeNamespaceCheck.cpp | 1 -
.../clang-tidy/llvmlibc/ImplementationInNamespaceCheck.cpp | 1 -
.../clang-tidy/llvmlibc/InlineFunctionDeclCheck.cpp | 2 --
.../clang-tidy/llvmlibc/RestrictSystemLibcHeadersCheck.cpp | 1 -
.../clang-tidy/misc/ConfusableIdentifierCheck.cpp | 1 -
.../clang-tidy/misc/HeaderIncludeCycleCheck.cpp | 3 ---
clang-tools-extra/clang-tidy/misc/IncludeCleanerCheck.cpp | 1 -
.../clang-tidy/misc/MisleadingBidirectional.cpp | 1 -
clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.cpp | 1 -
clang-tools-extra/clang-tidy/misc/NoRecursionCheck.cpp | 1 -
clang-tools-extra/clang-tidy/misc/NonCopyableObjects.cpp | 1 -
.../clang-tidy/misc/RedundantExpressionCheck.cpp | 4 ----
clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp | 2 --
.../clang-tidy/misc/ThrowByValueCatchByReferenceCheck.cpp | 1 -
clang-tools-extra/clang-tidy/misc/UnusedParametersCheck.cpp | 1 -
clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp | 3 ---
.../clang-tidy/modernize/ConcatNestedNamespacesCheck.cpp | 1 -
.../clang-tidy/modernize/DeprecatedHeadersCheck.cpp | 1 -
.../clang-tidy/modernize/DeprecatedIosBaseAliasesCheck.cpp | 1 -
clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp | 2 --
clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp | 2 --
clang-tools-extra/clang-tidy/modernize/MacroToEnumCheck.cpp | 1 -
.../clang-tidy/modernize/ReplaceRandomShuffleCheck.cpp | 2 --
.../clang-tidy/modernize/ReturnBracedInitListCheck.cpp | 1 -
.../clang-tidy/modernize/UnaryStaticAssertCheck.cpp | 1 -
clang-tools-extra/clang-tidy/modernize/UseStdFormatCheck.cpp | 1 -
clang-tools-extra/clang-tidy/modernize/UseStdPrintCheck.cpp | 1 -
.../clang-tidy/modernize/UseTransparentFunctorsCheck.cpp | 1 -
.../clang-tidy/modernize/UseUncaughtExceptionsCheck.cpp | 1 -
clang-tools-extra/clang-tidy/objc/AvoidNSErrorInitCheck.cpp | 1 -
.../clang-tidy/objc/ForbiddenSubclassingCheck.cpp | 2 --
clang-tools-extra/clang-tidy/objc/NSDateFormatterCheck.cpp | 1 -
.../clang-tidy/objc/PropertyDeclarationCheck.cpp | 5 -----
clang-tools-extra/clang-tidy/openmp/ExceptionEscapeCheck.cpp | 3 ---
clang-tools-extra/clang-tidy/openmp/UseDefaultNoneCheck.cpp | 3 ---
.../clang-tidy/performance/ForRangeCopyCheck.cpp | 1 -
.../performance/InefficientStringConcatenationCheck.cpp | 1 -
.../clang-tidy/performance/MoveConstructorInitCheck.cpp | 1 -
clang-tools-extra/clang-tidy/performance/NoIntToPtrCheck.cpp | 1 -
.../clang-tidy/performance/UnnecessaryCopyInitialization.cpp | 1 -
clang-tools-extra/clang-tidy/plugin/ClangTidyPlugin.cpp | 1 -
.../clang-tidy/portability/SIMDIntrinsicsCheck.cpp | 2 --
.../readability/FunctionCognitiveComplexityCheck.cpp | 3 ---
.../clang-tidy/readability/IdentifierLengthCheck.cpp | 2 --
.../clang-tidy/readability/IdentifierNamingCheck.cpp | 2 --
.../InconsistentDeclarationParameterNameCheck.cpp | 3 ---
.../clang-tidy/readability/MagicNumbersCheck.cpp | 1 -
.../clang-tidy/readability/NamespaceCommentCheck.cpp | 1 -
.../clang-tidy/readability/RedundantControlFlowCheck.cpp | 1 -
.../readability/RedundantFunctionPtrDereferenceCheck.cpp | 1 -
.../clang-tidy/readability/RedundantMemberInitCheck.cpp | 1 -
.../StaticDefinitionInAnonymousNamespaceCheck.cpp | 1 -
.../clang-tidy/readability/SuspiciousCallArgumentCheck.cpp | 1 -
.../clang-tidy/readability/UppercaseLiteralSuffixCheck.cpp | 1 -
clang-tools-extra/clang-tidy/utils/HeaderGuard.cpp | 1 -
clang-tools-extra/clang-tidy/utils/TypeTraits.cpp | 1 -
clang-tools-extra/clang-tidy/utils/UseRangesCheck.cpp | 1 -
.../clang-tidy/zircon/TemporaryObjectsCheck.cpp | 1 -
141 files changed, 201 deletions(-)
diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp
b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index 26f9afbc0880e..38d58bc137748 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -29,18 +29,14 @@
#include "clang/Frontend/FrontendDiagnostic.h"
#include "clang/Frontend/MultiplexConsumer.h"
#include "clang/Frontend/TextDiagnosticPrinter.h"
-#include "clang/Lex/PPCallbacks.h"
#include "clang/Lex/Preprocessor.h"
#include "clang/Lex/PreprocessorOptions.h"
#include "clang/Rewrite/Frontend/FixItRewriter.h"
-#include "clang/Rewrite/Frontend/FrontendActions.h"
#include "clang/Tooling/Core/Diagnostic.h"
#include "clang/Tooling/DiagnosticsYaml.h"
#include "clang/Tooling/Refactoring.h"
-#include "clang/Tooling/ReplacementsYaml.h"
#include "clang/Tooling/Tooling.h"
#include "llvm/Support/Process.h"
-#include <algorithm>
#include <utility>
#if CLANG_TIDY_ENABLE_STATIC_ANALYZER
diff --git a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
index a0253a5fd1a48..a71813a103df3 100644
--- a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
@@ -34,7 +34,6 @@
#include "clang/Tooling/Core/Replacement.h"
#include "llvm/ADT/BitVector.h"
#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/Support/FormatVariadic.h"
#include "llvm/Support/Regex.h"
diff --git a/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp
b/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp
index dd1d86882f5d4..1c480d107ae9c 100644
--- a/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp
@@ -11,9 +11,7 @@
#include "clang/Basic/LLVM.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/Support/Debug.h"
-#include "llvm/Support/Errc.h"
#include "llvm/Support/ErrorOr.h"
-#include "llvm/Support/FileSystem.h"
#include "llvm/Support/MemoryBufferRef.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/YAMLTraits.h"
diff --git a/clang-tools-extra/clang-tidy/NoLintDirectiveHandler.cpp
b/clang-tools-extra/clang-tidy/NoLintDirectiveHandler.cpp
index 45d00dc16c113..ed03b456f4954 100644
--- a/clang-tools-extra/clang-tidy/NoLintDirectiveHandler.cpp
+++ b/clang-tools-extra/clang-tidy/NoLintDirectiveHandler.cpp
@@ -18,7 +18,6 @@
#include "clang/Basic/SourceLocation.h"
#include "clang/Basic/SourceManager.h"
#include "clang/Tooling/Core/Diagnostic.h"
-#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringExtras.h"
@@ -30,7 +29,6 @@
#include <optional>
#include <string>
#include <tuple>
-#include <type_traits>
#include <utility>
namespace clang::tidy {
diff --git a/clang-tools-extra/clang-tidy/abseil/CleanupCtadCheck.cpp
b/clang-tools-extra/clang-tidy/abseil/CleanupCtadCheck.cpp
index 664ec59997b59..0819642be0558 100644
--- a/clang-tools-extra/clang-tidy/abseil/CleanupCtadCheck.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/CleanupCtadCheck.cpp
@@ -8,13 +8,10 @@
#include "CleanupCtadCheck.h"
#include "../utils/TransformerClangTidyCheck.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
#include "clang/Tooling/Transformer/RangeSelector.h"
#include "clang/Tooling/Transformer/RewriteRule.h"
#include "clang/Tooling/Transformer/Stencil.h"
-#include "llvm/ADT/StringRef.h"
using namespace ::clang::ast_matchers;
using namespace ::clang::transformer;
diff --git a/clang-tools-extra/clang-tidy/abseil/DurationComparisonCheck.cpp
b/clang-tools-extra/clang-tidy/abseil/DurationComparisonCheck.cpp
index 59b4a52165b59..3baacb36c3f7a 100644
--- a/clang-tools-extra/clang-tidy/abseil/DurationComparisonCheck.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/DurationComparisonCheck.cpp
@@ -8,9 +8,7 @@
#include "DurationComparisonCheck.h"
#include "DurationRewriter.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Tooling/FixIt.h"
#include <optional>
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/abseil/DurationFactoryFloatCheck.cpp
b/clang-tools-extra/clang-tidy/abseil/DurationFactoryFloatCheck.cpp
index 6cb687de4dc86..398f1691dca39 100644
--- a/clang-tools-extra/clang-tidy/abseil/DurationFactoryFloatCheck.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/DurationFactoryFloatCheck.cpp
@@ -11,7 +11,6 @@
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Lex/Lexer.h"
-#include "clang/Tooling/FixIt.h"
#include <optional>
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/abseil/NoInternalDependenciesCheck.cpp
b/clang-tools-extra/clang-tidy/abseil/NoInternalDependenciesCheck.cpp
index d04afa48e18de..edaa584a4d8ef 100644
--- a/clang-tools-extra/clang-tidy/abseil/NoInternalDependenciesCheck.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/NoInternalDependenciesCheck.cpp
@@ -8,7 +8,6 @@
#include "NoInternalDependenciesCheck.h"
#include "AbseilMatcher.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/abseil/NoNamespaceCheck.cpp
b/clang-tools-extra/clang-tidy/abseil/NoNamespaceCheck.cpp
index ec011bd4fe0e3..b45a9c99d780d 100644
--- a/clang-tools-extra/clang-tidy/abseil/NoNamespaceCheck.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/NoNamespaceCheck.cpp
@@ -8,7 +8,6 @@
#include "NoNamespaceCheck.h"
#include "AbseilMatcher.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/abseil/StringFindStrContainsCheck.cpp
b/clang-tools-extra/clang-tidy/abseil/StringFindStrContainsCheck.cpp
index 28b2f81fdc8c8..6e89783bb51eb 100644
--- a/clang-tools-extra/clang-tidy/abseil/StringFindStrContainsCheck.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/StringFindStrContainsCheck.cpp
@@ -11,7 +11,6 @@
#include "../utils/OptionsUtils.h"
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Frontend/CompilerInstance.h"
#include "clang/Tooling/Transformer/RewriteRule.h"
#include "clang/Tooling/Transformer/Stencil.h"
diff --git a/clang-tools-extra/clang-tidy/abseil/TimeComparisonCheck.cpp
b/clang-tools-extra/clang-tidy/abseil/TimeComparisonCheck.cpp
index d105786129d98..2bcd8064400f8 100644
--- a/clang-tools-extra/clang-tidy/abseil/TimeComparisonCheck.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/TimeComparisonCheck.cpp
@@ -9,9 +9,7 @@
#include "TimeComparisonCheck.h"
#include "DurationRewriter.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Tooling/FixIt.h"
#include <optional>
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/abseil/TimeSubtractionCheck.cpp
b/clang-tools-extra/clang-tidy/abseil/TimeSubtractionCheck.cpp
index a2171aad32b73..2def393938e67 100644
--- a/clang-tools-extra/clang-tidy/abseil/TimeSubtractionCheck.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/TimeSubtractionCheck.cpp
@@ -11,7 +11,6 @@
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Lex/Lexer.h"
-#include "clang/Tooling/FixIt.h"
#include <optional>
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.cpp
b/clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.cpp
index fb1e0e82a3149..a94d6c8d7c4e6 100644
--- a/clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.cpp
+++ b/clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.cpp
@@ -10,7 +10,6 @@
#include "clang/Frontend/CompilerInstance.h"
#include "clang/Lex/PPCallbacks.h"
#include "clang/Lex/Preprocessor.h"
-#include <string>
#include <vector>
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/android/CloexecAccept4Check.cpp
b/clang-tools-extra/clang-tidy/android/CloexecAccept4Check.cpp
index 77dca9be89580..8c4bcc70b300e 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecAccept4Check.cpp
+++ b/clang-tools-extra/clang-tidy/android/CloexecAccept4Check.cpp
@@ -7,8 +7,6 @@
//===----------------------------------------------------------------------===//
#include "CloexecAccept4Check.h"
-#include "../utils/ASTUtils.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/android/CloexecAcceptCheck.cpp
b/clang-tools-extra/clang-tidy/android/CloexecAcceptCheck.cpp
index 80be6fe326a28..8c34ecd6945c6 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecAcceptCheck.cpp
+++ b/clang-tools-extra/clang-tidy/android/CloexecAcceptCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "CloexecAcceptCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/android/CloexecCreatCheck.cpp
b/clang-tools-extra/clang-tidy/android/CloexecCreatCheck.cpp
index 514f11ff15c3d..ee270209e4fa6 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecCreatCheck.cpp
+++ b/clang-tools-extra/clang-tidy/android/CloexecCreatCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "CloexecCreatCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/android/CloexecDupCheck.cpp
b/clang-tools-extra/clang-tidy/android/CloexecDupCheck.cpp
index fad7bbdd8cffc..89191083c18c8 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecDupCheck.cpp
+++ b/clang-tools-extra/clang-tidy/android/CloexecDupCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "CloexecDupCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/android/CloexecEpollCreate1Check.cpp
b/clang-tools-extra/clang-tidy/android/CloexecEpollCreate1Check.cpp
index 1c5919c689672..01b771b2072c8 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecEpollCreate1Check.cpp
+++ b/clang-tools-extra/clang-tidy/android/CloexecEpollCreate1Check.cpp
@@ -7,8 +7,6 @@
//===----------------------------------------------------------------------===//
#include "CloexecEpollCreate1Check.h"
-#include "../utils/ASTUtils.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/android/CloexecEpollCreateCheck.cpp
b/clang-tools-extra/clang-tidy/android/CloexecEpollCreateCheck.cpp
index 0a7fe303875b3..fc02e542863bc 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecEpollCreateCheck.cpp
+++ b/clang-tools-extra/clang-tidy/android/CloexecEpollCreateCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "CloexecEpollCreateCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/android/CloexecFopenCheck.cpp
b/clang-tools-extra/clang-tidy/android/CloexecFopenCheck.cpp
index ab165981236ee..153e7af82d15c 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecFopenCheck.cpp
+++ b/clang-tools-extra/clang-tidy/android/CloexecFopenCheck.cpp
@@ -7,10 +7,7 @@
//===----------------------------------------------------------------------===//
#include "CloexecFopenCheck.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/Type.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Lex/Lexer.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/android/CloexecInotifyInit1Check.cpp
b/clang-tools-extra/clang-tidy/android/CloexecInotifyInit1Check.cpp
index 247b3e820cfee..910793582d67c 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecInotifyInit1Check.cpp
+++ b/clang-tools-extra/clang-tidy/android/CloexecInotifyInit1Check.cpp
@@ -7,8 +7,6 @@
//===----------------------------------------------------------------------===//
#include "CloexecInotifyInit1Check.h"
-#include "../utils/ASTUtils.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/android/CloexecInotifyInitCheck.cpp
b/clang-tools-extra/clang-tidy/android/CloexecInotifyInitCheck.cpp
index 0e26f9c5838a0..ed591799d0656 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecInotifyInitCheck.cpp
+++ b/clang-tools-extra/clang-tidy/android/CloexecInotifyInitCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "CloexecInotifyInitCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/android/CloexecOpenCheck.cpp
b/clang-tools-extra/clang-tidy/android/CloexecOpenCheck.cpp
index 8804bcb41f8f1..11807f95def47 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecOpenCheck.cpp
+++ b/clang-tools-extra/clang-tidy/android/CloexecOpenCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "CloexecOpenCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/android/CloexecPipe2Check.cpp
b/clang-tools-extra/clang-tidy/android/CloexecPipe2Check.cpp
index 773037d9211e8..2798c80146e90 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecPipe2Check.cpp
+++ b/clang-tools-extra/clang-tidy/android/CloexecPipe2Check.cpp
@@ -7,8 +7,6 @@
//===----------------------------------------------------------------------===//
#include "CloexecPipe2Check.h"
-#include "../utils/ASTUtils.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/android/CloexecPipeCheck.cpp
b/clang-tools-extra/clang-tidy/android/CloexecPipeCheck.cpp
index 8aa0d8f2dea13..9085be67b755e 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecPipeCheck.cpp
+++ b/clang-tools-extra/clang-tidy/android/CloexecPipeCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "CloexecPipeCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/android/CloexecSocketCheck.cpp
b/clang-tools-extra/clang-tidy/android/CloexecSocketCheck.cpp
index 9e2e6ca8f668a..65c6a82036cc5 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecSocketCheck.cpp
+++ b/clang-tools-extra/clang-tidy/android/CloexecSocketCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "CloexecSocketCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/android/ComparisonInTempFailureRetryCheck.cpp
b/clang-tools-extra/clang-tidy/android/ComparisonInTempFailureRetryCheck.cpp
index 9ad56fbb49d5f..4c33e5db6d5b9 100644
--- a/clang-tools-extra/clang-tidy/android/ComparisonInTempFailureRetryCheck.cpp
+++ b/clang-tools-extra/clang-tidy/android/ComparisonInTempFailureRetryCheck.cpp
@@ -6,7 +6,6 @@
//
//===----------------------------------------------------------------------===//
-#include "../utils/Matchers.h"
#include "ComparisonInTempFailureRetryCheck.h"
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
diff --git a/clang-tools-extra/clang-tidy/bugprone/AssertSideEffectCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/AssertSideEffectCheck.cpp
index c650aae4fa03c..0889a1a737189 100644
--- a/clang-tools-extra/clang-tidy/bugprone/AssertSideEffectCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/AssertSideEffectCheck.cpp
@@ -15,8 +15,6 @@
#include "clang/Lex/Lexer.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
-#include <algorithm>
#include <string>
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/bugprone/BranchCloneCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/BranchCloneCheck.cpp
index a544ef0d9dd04..0b76cfb2ad8dc 100644
--- a/clang-tools-extra/clang-tidy/bugprone/BranchCloneCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/BranchCloneCheck.cpp
@@ -13,7 +13,6 @@
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Analysis/CloneDetection.h"
#include "clang/Lex/Lexer.h"
-#include "llvm/Support/Casting.h"
using namespace clang;
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/bugprone/ComparePointerToMemberVirtualFunctionCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/ComparePointerToMemberVirtualFunctionCheck.cpp
index a8a9e6bdcdff8..f2746ba159d04 100644
---
a/clang-tools-extra/clang-tidy/bugprone/ComparePointerToMemberVirtualFunctionCheck.cpp
+++
b/clang-tools-extra/clang-tidy/bugprone/ComparePointerToMemberVirtualFunctionCheck.cpp
@@ -8,14 +8,12 @@
#include "ComparePointerToMemberVirtualFunctionCheck.h"
#include "clang/AST/ASTContext.h"
-#include "clang/AST/ASTTypeTraits.h"
#include "clang/AST/DeclCXX.h"
#include "clang/AST/OperationKinds.h"
#include "clang/AST/Type.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
#include "clang/ASTMatchers/ASTMatchersMacros.h"
-#include "clang/Basic/Diagnostic.h"
#include "clang/Basic/DiagnosticIDs.h"
#include "llvm/ADT/SmallVector.h"
diff --git a/clang-tools-extra/clang-tidy/bugprone/EmptyCatchCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/EmptyCatchCheck.cpp
index ff5b885aa95f8..be0a2a1baa12a 100644
--- a/clang-tools-extra/clang-tidy/bugprone/EmptyCatchCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/EmptyCatchCheck.cpp
@@ -12,7 +12,6 @@
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Lex/Lexer.h"
-#include <algorithm>
using namespace clang::ast_matchers;
using ::clang::ast_matchers::internal::Matcher;
diff --git a/clang-tools-extra/clang-tidy/bugprone/ExceptionEscapeCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/ExceptionEscapeCheck.cpp
index 7e9551532b72f..f008fa4eb9ef7 100644
--- a/clang-tools-extra/clang-tidy/bugprone/ExceptionEscapeCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/ExceptionEscapeCheck.cpp
@@ -8,9 +8,7 @@
#include "ExceptionEscapeCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/StringSet.h"
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/bugprone/ForwardDeclarationNamespaceCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/ForwardDeclarationNamespaceCheck.cpp
index 080454287f28b..75ef628436738 100644
--- a/clang-tools-extra/clang-tidy/bugprone/ForwardDeclarationNamespaceCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/ForwardDeclarationNamespaceCheck.cpp
@@ -11,7 +11,6 @@
#include "clang/AST/Decl.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
-#include <stack>
#include <string>
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/bugprone/InaccurateEraseCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/InaccurateEraseCheck.cpp
index 164de76d4fa46..7626bf89e694c 100644
--- a/clang-tools-extra/clang-tidy/bugprone/InaccurateEraseCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/InaccurateEraseCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "InaccurateEraseCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Lex/Lexer.h"
diff --git a/clang-tools-extra/clang-tidy/bugprone/IncorrectRoundingsCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/IncorrectRoundingsCheck.cpp
index c03af11b1bc4d..2a8d36215cc74 100644
--- a/clang-tools-extra/clang-tidy/bugprone/IncorrectRoundingsCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/IncorrectRoundingsCheck.cpp
@@ -7,11 +7,8 @@
//===----------------------------------------------------------------------===//
#include "IncorrectRoundingsCheck.h"
-#include "clang/AST/DeclBase.h"
-#include "clang/AST/Type.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Lex/Lexer.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/bugprone/IntegerDivisionCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/IntegerDivisionCheck.cpp
index 92e0413caceaa..63c932c94b6fb 100644
--- a/clang-tools-extra/clang-tidy/bugprone/IntegerDivisionCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/IntegerDivisionCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "IntegerDivisionCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/bugprone/MisplacedWideningCastCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/MisplacedWideningCastCheck.cpp
index a1f92aae55448..219972e0bdad7 100644
--- a/clang-tools-extra/clang-tidy/bugprone/MisplacedWideningCastCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/MisplacedWideningCastCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "MisplacedWideningCastCheck.h"
-#include "../utils/Matchers.h"
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
diff --git
a/clang-tools-extra/clang-tidy/bugprone/MoveForwardingReferenceCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/MoveForwardingReferenceCheck.cpp
index 96cd1ea29a020..33642c407a3a9 100644
--- a/clang-tools-extra/clang-tidy/bugprone/MoveForwardingReferenceCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/MoveForwardingReferenceCheck.cpp
@@ -8,9 +8,6 @@
#include "MoveForwardingReferenceCheck.h"
#include "clang/Lex/Lexer.h"
-#include "llvm/Support/raw_ostream.h"
-
-#include <algorithm>
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.cpp
index de7dab213eb24..8b2ca6968ea75 100644
--- a/clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.cpp
@@ -16,7 +16,6 @@
#include "llvm/ADT/APSInt.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/SmallVector.h"
#include <cstdint>
diff --git
a/clang-tools-extra/clang-tidy/bugprone/NondeterministicPointerIterationOrderCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/NondeterministicPointerIterationOrderCheck.cpp
index 22ecd68961469..2ddcfa02bfb96 100644
---
a/clang-tools-extra/clang-tidy/bugprone/NondeterministicPointerIterationOrderCheck.cpp
+++
b/clang-tools-extra/clang-tidy/bugprone/NondeterministicPointerIterationOrderCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "NondeterministicPointerIterationOrderCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/Lex/Lexer.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/bugprone/ParentVirtualCallCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/ParentVirtualCallCheck.cpp
index 552034938ae8f..56576ba360399 100644
--- a/clang-tools-extra/clang-tidy/bugprone/ParentVirtualCallCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/ParentVirtualCallCheck.cpp
@@ -12,7 +12,6 @@
#include "clang/Tooling/FixIt.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallVector.h"
-#include <algorithm>
#include <cctype>
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/bugprone/ReservedIdentifierCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/ReservedIdentifierCheck.cpp
index 53956661d57d1..5812c18a2ccca 100644
--- a/clang-tools-extra/clang-tidy/bugprone/ReservedIdentifierCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/ReservedIdentifierCheck.cpp
@@ -7,10 +7,8 @@
//===----------------------------------------------------------------------===//
#include "ReservedIdentifierCheck.h"
-#include "../utils/Matchers.h"
#include "../utils/OptionsUtils.h"
#include "clang/AST/ASTContext.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Lex/Token.h"
#include <algorithm>
#include <cctype>
diff --git a/clang-tools-extra/clang-tidy/bugprone/SizeofContainerCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/SizeofContainerCheck.cpp
index ff8b14913fde2..df2a3e26ea8dc 100644
--- a/clang-tools-extra/clang-tidy/bugprone/SizeofContainerCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/SizeofContainerCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "SizeofContainerCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/bugprone/StandaloneEmptyCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/StandaloneEmptyCheck.cpp
index 7114adfb311bc..682478ecead0b 100644
--- a/clang-tools-extra/clang-tidy/bugprone/StandaloneEmptyCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/StandaloneEmptyCheck.cpp
@@ -21,8 +21,6 @@
#include "clang/Basic/SourceLocation.h"
#include "clang/Lex/Lexer.h"
#include "clang/Sema/HeuristicResolver.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SmallVector.h"
#include "llvm/Support/Casting.h"
namespace clang::tidy::bugprone {
diff --git a/clang-tools-extra/clang-tidy/bugprone/StringviewNullptrCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/StringviewNullptrCheck.cpp
index 2489de17b740b..f944ae6c5b9e3 100644
--- a/clang-tools-extra/clang-tidy/bugprone/StringviewNullptrCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/StringviewNullptrCheck.cpp
@@ -8,10 +8,8 @@
#include "StringviewNullptrCheck.h"
#include "../utils/TransformerClangTidyCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/AST/Decl.h"
#include "clang/AST/OperationKinds.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
#include "clang/Tooling/Transformer/RangeSelector.h"
#include "clang/Tooling/Transformer/RewriteRule.h"
diff --git
a/clang-tools-extra/clang-tidy/bugprone/SuspiciousReallocUsageCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/SuspiciousReallocUsageCheck.cpp
index 8a6dcc3c05995..221cc832882f2 100644
--- a/clang-tools-extra/clang-tidy/bugprone/SuspiciousReallocUsageCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/SuspiciousReallocUsageCheck.cpp
@@ -7,9 +7,7 @@
//===----------------------------------------------------------------------===//
#include "SuspiciousReallocUsageCheck.h"
-#include "../utils/Aliasing.h"
#include "clang/AST/ASTContext.h"
-#include "clang/AST/DeclVisitor.h"
#include "clang/AST/StmtVisitor.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
diff --git
a/clang-tools-extra/clang-tidy/bugprone/SuspiciousStringCompareCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/SuspiciousStringCompareCheck.cpp
index 151f24907edd6..33cf04dd56593 100644
--- a/clang-tools-extra/clang-tidy/bugprone/SuspiciousStringCompareCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/SuspiciousStringCompareCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "SuspiciousStringCompareCheck.h"
-#include "../utils/Matchers.h"
#include "../utils/OptionsUtils.h"
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
diff --git
a/clang-tools-extra/clang-tidy/bugprone/SwitchMissingDefaultCaseCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/SwitchMissingDefaultCaseCheck.cpp
index d1d50fe26b29e..b8fc62e8c3292 100644
--- a/clang-tools-extra/clang-tidy/bugprone/SwitchMissingDefaultCaseCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/SwitchMissingDefaultCaseCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "SwitchMissingDefaultCaseCheck.h"
-#include "clang/AST/ASTContext.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/bugprone/TerminatingContinueCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/TerminatingContinueCheck.cpp
index e8f63fb7091d7..d31211b571734 100644
--- a/clang-tools-extra/clang-tidy/bugprone/TerminatingContinueCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/TerminatingContinueCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "TerminatingContinueCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Lex/Lexer.h"
#include "clang/Tooling/FixIt.h"
diff --git
a/clang-tools-extra/clang-tidy/bugprone/UndelegatedConstructorCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/UndelegatedConstructorCheck.cpp
index bea447f961892..9db14ab40ce59 100644
--- a/clang-tools-extra/clang-tidy/bugprone/UndelegatedConstructorCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/UndelegatedConstructorCheck.cpp
@@ -8,7 +8,6 @@
#include "UndelegatedConstructorCheck.h"
#include "clang/AST/ASTContext.h"
-#include "clang/Lex/Lexer.h"
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/bugprone/UnhandledExceptionAtNewCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/UnhandledExceptionAtNewCheck.cpp
index b160e7259905b..ca4562aa9a44f 100644
--- a/clang-tools-extra/clang-tidy/bugprone/UnhandledExceptionAtNewCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/UnhandledExceptionAtNewCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "UnhandledExceptionAtNewCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/bugprone/UnusedReturnValueCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/UnusedReturnValueCheck.cpp
index 1da5b222c2e8f..6f08c41b41887 100644
--- a/clang-tools-extra/clang-tidy/bugprone/UnusedReturnValueCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/UnusedReturnValueCheck.cpp
@@ -9,7 +9,6 @@
#include "UnusedReturnValueCheck.h"
#include "../utils/Matchers.h"
#include "../utils/OptionsUtils.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
#include "clang/Basic/OperatorKinds.h"
diff --git a/clang-tools-extra/clang-tidy/cert/CommandProcessorCheck.cpp
b/clang-tools-extra/clang-tidy/cert/CommandProcessorCheck.cpp
index 1c57a8fa8e509..d377c24da1f46 100644
--- a/clang-tools-extra/clang-tidy/cert/CommandProcessorCheck.cpp
+++ b/clang-tools-extra/clang-tidy/cert/CommandProcessorCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "CommandProcessorCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/cert/DontModifyStdNamespaceCheck.cpp
b/clang-tools-extra/clang-tidy/cert/DontModifyStdNamespaceCheck.cpp
index bc4970825b4ca..e86ed6319a695 100644
--- a/clang-tools-extra/clang-tidy/cert/DontModifyStdNamespaceCheck.cpp
+++ b/clang-tools-extra/clang-tidy/cert/DontModifyStdNamespaceCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "DontModifyStdNamespaceCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchersInternal.h"
diff --git
a/clang-tools-extra/clang-tidy/cert/NonTrivialTypesLibcMemoryCallsCheck.cpp
b/clang-tools-extra/clang-tidy/cert/NonTrivialTypesLibcMemoryCallsCheck.cpp
index 1e52884a806b2..afeef2a80ba54 100644
--- a/clang-tools-extra/clang-tidy/cert/NonTrivialTypesLibcMemoryCallsCheck.cpp
+++ b/clang-tools-extra/clang-tidy/cert/NonTrivialTypesLibcMemoryCallsCheck.cpp
@@ -13,9 +13,7 @@
#include "clang/ASTMatchers/ASTMatchers.h"
#include "clang/ASTMatchers/ASTMatchersInternal.h"
#include "clang/ASTMatchers/ASTMatchersMacros.h"
-#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/raw_ostream.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/cert/StaticObjectExceptionCheck.cpp
b/clang-tools-extra/clang-tidy/cert/StaticObjectExceptionCheck.cpp
index c2a42a78c9e48..12830a64bf23e 100644
--- a/clang-tools-extra/clang-tidy/cert/StaticObjectExceptionCheck.cpp
+++ b/clang-tools-extra/clang-tidy/cert/StaticObjectExceptionCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "StaticObjectExceptionCheck.h"
-#include "../utils/Matchers.h"
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
diff --git a/clang-tools-extra/clang-tidy/cert/ThrownExceptionTypeCheck.cpp
b/clang-tools-extra/clang-tidy/cert/ThrownExceptionTypeCheck.cpp
index 4452192be2323..cbc2991ca6399 100644
--- a/clang-tools-extra/clang-tidy/cert/ThrownExceptionTypeCheck.cpp
+++ b/clang-tools-extra/clang-tidy/cert/ThrownExceptionTypeCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "ThrownExceptionTypeCheck.h"
-#include "../utils/Matchers.h"
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
diff --git a/clang-tools-extra/clang-tidy/cert/VariadicFunctionDefCheck.cpp
b/clang-tools-extra/clang-tidy/cert/VariadicFunctionDefCheck.cpp
index aeeedbba56123..5fba32417db42 100644
--- a/clang-tools-extra/clang-tidy/cert/VariadicFunctionDefCheck.cpp
+++ b/clang-tools-extra/clang-tidy/cert/VariadicFunctionDefCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "VariadicFunctionDefCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/concurrency/MtUnsafeCheck.cpp
b/clang-tools-extra/clang-tidy/concurrency/MtUnsafeCheck.cpp
index cf076bb40484f..7e80471b12302 100644
--- a/clang-tools-extra/clang-tidy/concurrency/MtUnsafeCheck.cpp
+++ b/clang-tools-extra/clang-tidy/concurrency/MtUnsafeCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "MtUnsafeCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/concurrency/ThreadCanceltypeAsynchronousCheck.cpp
b/clang-tools-extra/clang-tidy/concurrency/ThreadCanceltypeAsynchronousCheck.cpp
index 6ea9884a1a31c..130b56fb6cd04 100644
---
a/clang-tools-extra/clang-tidy/concurrency/ThreadCanceltypeAsynchronousCheck.cpp
+++
b/clang-tools-extra/clang-tidy/concurrency/ThreadCanceltypeAsynchronousCheck.cpp
@@ -9,7 +9,6 @@
#include "ThreadCanceltypeAsynchronousCheck.h"
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Lex/Preprocessor.h"
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/cppcoreguidelines/AvoidDoWhileCheck.cpp
b/clang-tools-extra/clang-tidy/cppcoreguidelines/AvoidDoWhileCheck.cpp
index fd6586506187d..8f2846b74c24e 100644
--- a/clang-tools-extra/clang-tidy/cppcoreguidelines/AvoidDoWhileCheck.cpp
+++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/AvoidDoWhileCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "AvoidDoWhileCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/AvoidGotoCheck.cpp
b/clang-tools-extra/clang-tidy/cppcoreguidelines/AvoidGotoCheck.cpp
index 5e6a6772b34d8..8ffa44d41fa98 100644
--- a/clang-tools-extra/clang-tidy/cppcoreguidelines/AvoidGotoCheck.cpp
+++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/AvoidGotoCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "AvoidGotoCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/cppcoreguidelines/AvoidReferenceCoroutineParametersCheck.cpp
b/clang-tools-extra/clang-tidy/cppcoreguidelines/AvoidReferenceCoroutineParametersCheck.cpp
index 82e55cc2d28ea..3eca364d16c35 100644
---
a/clang-tools-extra/clang-tidy/cppcoreguidelines/AvoidReferenceCoroutineParametersCheck.cpp
+++
b/clang-tools-extra/clang-tidy/cppcoreguidelines/AvoidReferenceCoroutineParametersCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "AvoidReferenceCoroutineParametersCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/cppcoreguidelines/InterfacesGlobalInitCheck.cpp
b/clang-tools-extra/clang-tidy/cppcoreguidelines/InterfacesGlobalInitCheck.cpp
index 18d297f4161bf..e8a2e7b8ef86d 100644
---
a/clang-tools-extra/clang-tidy/cppcoreguidelines/InterfacesGlobalInitCheck.cpp
+++
b/clang-tools-extra/clang-tidy/cppcoreguidelines/InterfacesGlobalInitCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "InterfacesGlobalInitCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/NoMallocCheck.cpp
b/clang-tools-extra/clang-tidy/cppcoreguidelines/NoMallocCheck.cpp
index d23238369c4f5..b81c6230b8941 100644
--- a/clang-tools-extra/clang-tidy/cppcoreguidelines/NoMallocCheck.cpp
+++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/NoMallocCheck.cpp
@@ -7,13 +7,8 @@
//===----------------------------------------------------------------------===//
#include "NoMallocCheck.h"
-#include "../utils/Matchers.h"
#include "../utils/OptionsUtils.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include <algorithm>
-#include <string>
-#include <vector>
using namespace clang::ast_matchers;
using namespace clang::ast_matchers::internal;
diff --git
a/clang-tools-extra/clang-tidy/cppcoreguidelines/OwningMemoryCheck.cpp
b/clang-tools-extra/clang-tidy/cppcoreguidelines/OwningMemoryCheck.cpp
index 9b4d2ef99e5bf..6cdd5bcac6370 100644
--- a/clang-tools-extra/clang-tidy/cppcoreguidelines/OwningMemoryCheck.cpp
+++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/OwningMemoryCheck.cpp
@@ -7,12 +7,10 @@
//===----------------------------------------------------------------------===//
#include "OwningMemoryCheck.h"
-#include "../utils/Matchers.h"
#include "../utils/OptionsUtils.h"
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include <string>
-#include <vector>
using namespace clang::ast_matchers;
using namespace clang::ast_matchers::internal;
diff --git
a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeReinterpretCastCheck.cpp
b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeReinterpretCastCheck.cpp
index 14456caab612b..94cea79888555 100644
---
a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeReinterpretCastCheck.cpp
+++
b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeReinterpretCastCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "ProTypeReinterpretCastCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeUnionAccessCheck.cpp
b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeUnionAccessCheck.cpp
index c29c4eb60f9d1..2793dfbc0eb3f 100644
--- a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeUnionAccessCheck.cpp
+++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeUnionAccessCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "ProTypeUnionAccessCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.cpp
b/clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.cpp
index ed76ac665049d..b1da3b9861c69 100644
---
a/clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.cpp
+++
b/clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.cpp
@@ -10,7 +10,6 @@
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "llvm/ADT/DenseMapInfo.h"
#include "llvm/ADT/StringExtras.h"
#define DEBUG_TYPE "clang-tidy"
diff --git a/clang-tools-extra/clang-tidy/darwin/AvoidSpinlockCheck.cpp
b/clang-tools-extra/clang-tidy/darwin/AvoidSpinlockCheck.cpp
index 8864fdb786db5..2d3a7e50f242e 100644
--- a/clang-tools-extra/clang-tidy/darwin/AvoidSpinlockCheck.cpp
+++ b/clang-tools-extra/clang-tidy/darwin/AvoidSpinlockCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "AvoidSpinlockCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/fuchsia/TrailingReturnCheck.cpp
b/clang-tools-extra/clang-tidy/fuchsia/TrailingReturnCheck.cpp
index 06e26376340d0..b619812837753 100644
--- a/clang-tools-extra/clang-tidy/fuchsia/TrailingReturnCheck.cpp
+++ b/clang-tools-extra/clang-tidy/fuchsia/TrailingReturnCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "TrailingReturnCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchersInternal.h"
diff --git
a/clang-tools-extra/clang-tidy/google/AvoidThrowingObjCExceptionCheck.cpp
b/clang-tools-extra/clang-tidy/google/AvoidThrowingObjCExceptionCheck.cpp
index 8346ef2a2a9f1..6322f63233590 100644
--- a/clang-tools-extra/clang-tidy/google/AvoidThrowingObjCExceptionCheck.cpp
+++ b/clang-tools-extra/clang-tidy/google/AvoidThrowingObjCExceptionCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "AvoidThrowingObjCExceptionCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/google/AvoidUnderscoreInGoogletestNameCheck.cpp
b/clang-tools-extra/clang-tidy/google/AvoidUnderscoreInGoogletestNameCheck.cpp
index d522d6760af1d..f2507f0b60e71 100644
---
a/clang-tools-extra/clang-tidy/google/AvoidUnderscoreInGoogletestNameCheck.cpp
+++
b/clang-tools-extra/clang-tidy/google/AvoidUnderscoreInGoogletestNameCheck.cpp
@@ -10,7 +10,6 @@
#include "AvoidUnderscoreInGoogletestNameCheck.h"
#include "clang/AST/ASTContext.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
#include "clang/Frontend/CompilerInstance.h"
#include "clang/Lex/MacroArgs.h"
#include "clang/Lex/PPCallbacks.h"
diff --git a/clang-tools-extra/clang-tidy/google/FunctionNamingCheck.cpp
b/clang-tools-extra/clang-tidy/google/FunctionNamingCheck.cpp
index 5cf256ea5c847..6631030734d25 100644
--- a/clang-tools-extra/clang-tidy/google/FunctionNamingCheck.cpp
+++ b/clang-tools-extra/clang-tidy/google/FunctionNamingCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "FunctionNamingCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "llvm/Support/Regex.h"
diff --git a/clang-tools-extra/clang-tidy/google/GlobalNamesInHeadersCheck.cpp
b/clang-tools-extra/clang-tidy/google/GlobalNamesInHeadersCheck.cpp
index d40b4c1a1c3f7..cba8d71ab6a31 100644
--- a/clang-tools-extra/clang-tidy/google/GlobalNamesInHeadersCheck.cpp
+++ b/clang-tools-extra/clang-tidy/google/GlobalNamesInHeadersCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "GlobalNamesInHeadersCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
#include "clang/Lex/Lexer.h"
diff --git
a/clang-tools-extra/clang-tidy/google/GlobalVariableDeclarationCheck.cpp
b/clang-tools-extra/clang-tidy/google/GlobalVariableDeclarationCheck.cpp
index 04971907bc5be..018d49fa5a22b 100644
--- a/clang-tools-extra/clang-tidy/google/GlobalVariableDeclarationCheck.cpp
+++ b/clang-tools-extra/clang-tidy/google/GlobalVariableDeclarationCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "GlobalVariableDeclarationCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/StringRef.h"
diff --git a/clang-tools-extra/clang-tidy/google/OverloadedUnaryAndCheck.cpp
b/clang-tools-extra/clang-tidy/google/OverloadedUnaryAndCheck.cpp
index a7536607e533f..6ec907ab1b696 100644
--- a/clang-tools-extra/clang-tidy/google/OverloadedUnaryAndCheck.cpp
+++ b/clang-tools-extra/clang-tidy/google/OverloadedUnaryAndCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "OverloadedUnaryAndCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
diff --git
a/clang-tools-extra/clang-tidy/google/UnnamedNamespaceInHeaderCheck.cpp
b/clang-tools-extra/clang-tidy/google/UnnamedNamespaceInHeaderCheck.cpp
index 34ddd7623bf5e..3db27868fccaf 100644
--- a/clang-tools-extra/clang-tidy/google/UnnamedNamespaceInHeaderCheck.cpp
+++ b/clang-tools-extra/clang-tidy/google/UnnamedNamespaceInHeaderCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "UnnamedNamespaceInHeaderCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
diff --git
a/clang-tools-extra/clang-tidy/google/UsingNamespaceDirectiveCheck.cpp
b/clang-tools-extra/clang-tidy/google/UsingNamespaceDirectiveCheck.cpp
index c97bd48e6c3e3..e9734e54a13e2 100644
--- a/clang-tools-extra/clang-tidy/google/UsingNamespaceDirectiveCheck.cpp
+++ b/clang-tools-extra/clang-tidy/google/UsingNamespaceDirectiveCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "UsingNamespaceDirectiveCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
diff --git a/clang-tools-extra/clang-tidy/hicpp/HICPPTidyModule.cpp
b/clang-tools-extra/clang-tidy/hicpp/HICPPTidyModule.cpp
index daa9f398a740e..38f3ab5ae85d3 100644
--- a/clang-tools-extra/clang-tidy/hicpp/HICPPTidyModule.cpp
+++ b/clang-tools-extra/clang-tidy/hicpp/HICPPTidyModule.cpp
@@ -17,7 +17,6 @@
#include "../cppcoreguidelines/ProTypeMemberInitCheck.h"
#include "../cppcoreguidelines/ProTypeVarargCheck.h"
#include "../cppcoreguidelines/SpecialMemberFunctionsCheck.h"
-#include "../google/DefaultArgumentsCheck.h"
#include "../google/ExplicitConstructorCheck.h"
#include "../misc/NewDeleteOverloadsCheck.h"
#include "../misc/StaticAssertCheck.h"
diff --git a/clang-tools-extra/clang-tidy/hicpp/NoAssemblerCheck.cpp
b/clang-tools-extra/clang-tidy/hicpp/NoAssemblerCheck.cpp
index 9f31227d9753b..54ba6aebab1ba 100644
--- a/clang-tools-extra/clang-tidy/hicpp/NoAssemblerCheck.cpp
+++ b/clang-tools-extra/clang-tidy/hicpp/NoAssemblerCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "NoAssemblerCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/linuxkernel/MustCheckErrsCheck.cpp
b/clang-tools-extra/clang-tidy/linuxkernel/MustCheckErrsCheck.cpp
index 3889fd536f2dc..149d0a94eaa5a 100644
--- a/clang-tools-extra/clang-tidy/linuxkernel/MustCheckErrsCheck.cpp
+++ b/clang-tools-extra/clang-tidy/linuxkernel/MustCheckErrsCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "MustCheckErrsCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/llvm/PreferRegisterOverUnsignedCheck.cpp
b/clang-tools-extra/clang-tidy/llvm/PreferRegisterOverUnsignedCheck.cpp
index 36c6baa531f41..f88122360aeb1 100644
--- a/clang-tools-extra/clang-tidy/llvm/PreferRegisterOverUnsignedCheck.cpp
+++ b/clang-tools-extra/clang-tidy/llvm/PreferRegisterOverUnsignedCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "PreferRegisterOverUnsignedCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/llvmlibc/CalleeNamespaceCheck.cpp
b/clang-tools-extra/clang-tidy/llvmlibc/CalleeNamespaceCheck.cpp
index caa19c595823f..d14cd2721d9a1 100644
--- a/clang-tools-extra/clang-tidy/llvmlibc/CalleeNamespaceCheck.cpp
+++ b/clang-tools-extra/clang-tidy/llvmlibc/CalleeNamespaceCheck.cpp
@@ -8,7 +8,6 @@
#include "CalleeNamespaceCheck.h"
#include "NamespaceConstants.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
diff --git
a/clang-tools-extra/clang-tidy/llvmlibc/ImplementationInNamespaceCheck.cpp
b/clang-tools-extra/clang-tidy/llvmlibc/ImplementationInNamespaceCheck.cpp
index bb436e4d12a30..c2fbc4422e5d2 100644
--- a/clang-tools-extra/clang-tidy/llvmlibc/ImplementationInNamespaceCheck.cpp
+++ b/clang-tools-extra/clang-tidy/llvmlibc/ImplementationInNamespaceCheck.cpp
@@ -8,7 +8,6 @@
#include "ImplementationInNamespaceCheck.h"
#include "NamespaceConstants.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/llvmlibc/InlineFunctionDeclCheck.cpp
b/clang-tools-extra/clang-tidy/llvmlibc/InlineFunctionDeclCheck.cpp
index 0607fd9d5add8..4d92b1f6b8d1c 100644
--- a/clang-tools-extra/clang-tidy/llvmlibc/InlineFunctionDeclCheck.cpp
+++ b/clang-tools-extra/clang-tidy/llvmlibc/InlineFunctionDeclCheck.cpp
@@ -12,8 +12,6 @@
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "llvm/ADT/StringSet.h"
-
using namespace clang::ast_matchers;
namespace clang::tidy::llvm_libc {
diff --git
a/clang-tools-extra/clang-tidy/llvmlibc/RestrictSystemLibcHeadersCheck.cpp
b/clang-tools-extra/clang-tidy/llvmlibc/RestrictSystemLibcHeadersCheck.cpp
index b656917071a6c..7db648abcc882 100644
--- a/clang-tools-extra/clang-tidy/llvmlibc/RestrictSystemLibcHeadersCheck.cpp
+++ b/clang-tools-extra/clang-tidy/llvmlibc/RestrictSystemLibcHeadersCheck.cpp
@@ -8,7 +8,6 @@
#include "RestrictSystemLibcHeadersCheck.h"
#include "clang/AST/ASTContext.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Lex/HeaderSearch.h"
#include "clang/Lex/HeaderSearchOptions.h"
#include "clang/Lex/Preprocessor.h"
diff --git a/clang-tools-extra/clang-tidy/misc/ConfusableIdentifierCheck.cpp
b/clang-tools-extra/clang-tidy/misc/ConfusableIdentifierCheck.cpp
index b45a3ebcf6c4b..7639476980529 100644
--- a/clang-tools-extra/clang-tidy/misc/ConfusableIdentifierCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/ConfusableIdentifierCheck.cpp
@@ -9,7 +9,6 @@
#include "ConfusableIdentifierCheck.h"
-#include "clang/Frontend/CompilerInstance.h"
#include "clang/Lex/Preprocessor.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/Support/ConvertUTF.h"
diff --git a/clang-tools-extra/clang-tidy/misc/HeaderIncludeCycleCheck.cpp
b/clang-tools-extra/clang-tidy/misc/HeaderIncludeCycleCheck.cpp
index cdb5e6b16069b..21d443a1f34ff 100644
--- a/clang-tools-extra/clang-tidy/misc/HeaderIncludeCycleCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/HeaderIncludeCycleCheck.cpp
@@ -9,15 +9,12 @@
#include "HeaderIncludeCycleCheck.h"
#include "../utils/OptionsUtils.h"
#include "clang/AST/ASTContext.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Lex/PPCallbacks.h"
#include "clang/Lex/Preprocessor.h"
-#include "llvm/ADT/SmallVector.h"
#include "llvm/Support/Regex.h"
#include <algorithm>
#include <deque>
#include <optional>
-#include <string>
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/misc/IncludeCleanerCheck.cpp
b/clang-tools-extra/clang-tidy/misc/IncludeCleanerCheck.cpp
index 52a94f3c040aa..813005b892ed7 100644
--- a/clang-tools-extra/clang-tidy/misc/IncludeCleanerCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/IncludeCleanerCheck.cpp
@@ -26,7 +26,6 @@
#include "clang/Basic/LangOptions.h"
#include "clang/Basic/SourceLocation.h"
#include "clang/Format/Format.h"
-#include "clang/Lex/HeaderSearchOptions.h"
#include "clang/Lex/Preprocessor.h"
#include "clang/Tooling/Core/Replacement.h"
#include "clang/Tooling/Inclusions/HeaderIncludes.h"
diff --git a/clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.cpp
b/clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.cpp
index da7139255bfaa..d7040e28984b0 100644
--- a/clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.cpp
+++ b/clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.cpp
@@ -11,7 +11,6 @@
#include "clang/Frontend/CompilerInstance.h"
#include "clang/Lex/Preprocessor.h"
#include "llvm/Support/ConvertUTF.h"
-#include <optional>
using namespace clang;
using namespace clang::tidy::misc;
diff --git a/clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.cpp
b/clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.cpp
index 0448a71260b13..1f5dc94755559 100644
--- a/clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.cpp
+++ b/clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.cpp
@@ -8,7 +8,6 @@
#include "MisleadingIdentifier.h"
-#include "clang/Frontend/CompilerInstance.h"
#include "llvm/Support/ConvertUTF.h"
namespace clang::tidy::misc {
diff --git a/clang-tools-extra/clang-tidy/misc/NoRecursionCheck.cpp
b/clang-tools-extra/clang-tidy/misc/NoRecursionCheck.cpp
index 47f3f96ed803b..712f390765957 100644
--- a/clang-tools-extra/clang-tidy/misc/NoRecursionCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/NoRecursionCheck.cpp
@@ -10,7 +10,6 @@
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Analysis/CallGraph.h"
-#include "llvm/ADT/DenseMapInfo.h"
#include "llvm/ADT/SCCIterator.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/misc/NonCopyableObjects.cpp
b/clang-tools-extra/clang-tidy/misc/NonCopyableObjects.cpp
index 4c415a7fd23d7..6fb4a66d0bac6 100644
--- a/clang-tools-extra/clang-tidy/misc/NonCopyableObjects.cpp
+++ b/clang-tools-extra/clang-tidy/misc/NonCopyableObjects.cpp
@@ -9,7 +9,6 @@
#include "NonCopyableObjects.h"
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include <algorithm>
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp
b/clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp
index 8e5a528bc5d3e..cf81da816964f 100644
--- a/clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp
@@ -8,9 +8,7 @@
#include "RedundantExpressionCheck.h"
#include "../utils/Matchers.h"
-#include "../utils/OptionsUtils.h"
#include "clang/AST/ASTContext.h"
-#include "clang/AST/ExprConcepts.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Basic/LLVM.h"
#include "clang/Basic/SourceLocation.h"
@@ -20,14 +18,12 @@
#include "llvm/ADT/APSInt.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/SmallBitVector.h"
-#include "llvm/Support/Casting.h"
#include "llvm/Support/FormatVariadic.h"
#include <algorithm>
#include <cassert>
#include <cstdint>
#include <optional>
#include <string>
-#include <vector>
using namespace clang::ast_matchers;
using namespace clang::tidy::matchers;
diff --git a/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp
b/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp
index 35536b47700a6..faff1c17fc61e 100644
--- a/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp
@@ -13,9 +13,7 @@
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Frontend/CompilerInstance.h"
#include "clang/Lex/Lexer.h"
-#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
#include <optional>
#include <string>
diff --git
a/clang-tools-extra/clang-tidy/misc/ThrowByValueCatchByReferenceCheck.cpp
b/clang-tools-extra/clang-tidy/misc/ThrowByValueCatchByReferenceCheck.cpp
index abe7bed9df983..fd2e6b7f39a6b 100644
--- a/clang-tools-extra/clang-tidy/misc/ThrowByValueCatchByReferenceCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/ThrowByValueCatchByReferenceCheck.cpp
@@ -8,7 +8,6 @@
#include "ThrowByValueCatchByReferenceCheck.h"
#include "clang/AST/ASTContext.h"
-#include "clang/AST/OperationKinds.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/misc/UnusedParametersCheck.cpp
b/clang-tools-extra/clang-tidy/misc/UnusedParametersCheck.cpp
index d792b5c52191f..737551637ea9e 100644
--- a/clang-tools-extra/clang-tidy/misc/UnusedParametersCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/UnusedParametersCheck.cpp
@@ -15,7 +15,6 @@
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Basic/SourceManager.h"
#include "clang/Lex/Lexer.h"
-#include "llvm/ADT/STLExtras.h"
#include <unordered_map>
#include <unordered_set>
diff --git a/clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp
b/clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp
index bb06f7ff71d8f..a41524af56800 100644
--- a/clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp
@@ -10,7 +10,6 @@
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Basic/LLVM.h"
-#include "clang/Basic/LangOptions.h"
#include "clang/Basic/SourceLocation.h"
#include "clang/Lex/Lexer.h"
#include "llvm/ADT/ArrayRef.h"
@@ -19,11 +18,9 @@
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/StringSet.h"
-#include "llvm/Support/Casting.h"
#include "llvm/Support/FormatVariadic.h"
#include "llvm/Support/Regex.h"
#include "llvm/Support/raw_ostream.h"
-#include <algorithm>
#include <cstddef>
#include <string>
diff --git
a/clang-tools-extra/clang-tidy/modernize/ConcatNestedNamespacesCheck.cpp
b/clang-tools-extra/clang-tidy/modernize/ConcatNestedNamespacesCheck.cpp
index d24b613015d8e..f6404dbfce232 100644
--- a/clang-tools-extra/clang-tidy/modernize/ConcatNestedNamespacesCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/ConcatNestedNamespacesCheck.cpp
@@ -12,7 +12,6 @@
#include "clang/AST/Decl.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Basic/SourceLocation.h"
-#include <algorithm>
#include <optional>
namespace clang::tidy::modernize {
diff --git a/clang-tools-extra/clang-tidy/modernize/DeprecatedHeadersCheck.cpp
b/clang-tools-extra/clang-tidy/modernize/DeprecatedHeadersCheck.cpp
index 3d3a79d8eaf21..35a062382ea3c 100644
--- a/clang-tools-extra/clang-tidy/modernize/DeprecatedHeadersCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/DeprecatedHeadersCheck.cpp
@@ -14,7 +14,6 @@
#include "llvm/ADT/StringMap.h"
#include "llvm/ADT/StringSet.h"
-#include <algorithm>
#include <vector>
using IncludeMarker =
diff --git
a/clang-tools-extra/clang-tidy/modernize/DeprecatedIosBaseAliasesCheck.cpp
b/clang-tools-extra/clang-tidy/modernize/DeprecatedIosBaseAliasesCheck.cpp
index a1607c83ce522..f22f48d831608 100644
--- a/clang-tools-extra/clang-tidy/modernize/DeprecatedIosBaseAliasesCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/DeprecatedIosBaseAliasesCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "DeprecatedIosBaseAliasesCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include <optional>
diff --git a/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
b/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
index 1c6a1618ebbc4..eb11ae6162028 100644
--- a/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
@@ -18,12 +18,10 @@
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/StringSet.h"
-#include "llvm/Support/Casting.h"
#include "llvm/Support/raw_ostream.h"
#include <cassert>
#include <cstring>
#include <optional>
-#include <tuple>
#include <utility>
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp
b/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp
index 90c16bfddd84f..93c231b0bdf08 100644
--- a/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp
@@ -18,8 +18,6 @@
#include "llvm/ADT/APSInt.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
-#include <algorithm>
#include <cassert>
#include <cstddef>
#include <optional>
diff --git a/clang-tools-extra/clang-tidy/modernize/MacroToEnumCheck.cpp
b/clang-tools-extra/clang-tidy/modernize/MacroToEnumCheck.cpp
index c2bbd2e563d8f..ae88ec2abaf72 100644
--- a/clang-tools-extra/clang-tidy/modernize/MacroToEnumCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/MacroToEnumCheck.cpp
@@ -13,7 +13,6 @@
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Lex/Preprocessor.h"
#include "llvm/ADT/STLExtras.h"
-#include <algorithm>
#include <cassert>
#include <cctype>
#include <string>
diff --git
a/clang-tools-extra/clang-tidy/modernize/ReplaceRandomShuffleCheck.cpp
b/clang-tools-extra/clang-tidy/modernize/ReplaceRandomShuffleCheck.cpp
index 6a295dbfd0582..df20800a215da 100644
--- a/clang-tools-extra/clang-tidy/modernize/ReplaceRandomShuffleCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/ReplaceRandomShuffleCheck.cpp
@@ -7,12 +7,10 @@
//===----------------------------------------------------------------------===//
#include "ReplaceRandomShuffleCheck.h"
-#include "../utils/FixItHintUtils.h"
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Frontend/CompilerInstance.h"
#include "clang/Lex/Preprocessor.h"
-#include "clang/Tooling/FixIt.h"
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/modernize/ReturnBracedInitListCheck.cpp
b/clang-tools-extra/clang-tidy/modernize/ReturnBracedInitListCheck.cpp
index d7796666d0db2..472cc34be4378 100644
--- a/clang-tools-extra/clang-tidy/modernize/ReturnBracedInitListCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/ReturnBracedInitListCheck.cpp
@@ -11,7 +11,6 @@
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
#include "clang/Lex/Lexer.h"
-#include "clang/Tooling/FixIt.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/modernize/UnaryStaticAssertCheck.cpp
b/clang-tools-extra/clang-tidy/modernize/UnaryStaticAssertCheck.cpp
index c90d2e4f764b8..d4ca652838741 100644
--- a/clang-tools-extra/clang-tidy/modernize/UnaryStaticAssertCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/UnaryStaticAssertCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "UnaryStaticAssertCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/modernize/UseStdFormatCheck.cpp
b/clang-tools-extra/clang-tidy/modernize/UseStdFormatCheck.cpp
index f97b844c56496..cf2fa1955ca1b 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseStdFormatCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/UseStdFormatCheck.cpp
@@ -12,7 +12,6 @@
#include "../utils/OptionsUtils.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Lex/Lexer.h"
-#include "clang/Tooling/FixIt.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/modernize/UseStdPrintCheck.cpp
b/clang-tools-extra/clang-tidy/modernize/UseStdPrintCheck.cpp
index 4f24098225074..aad5a4778b3af 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseStdPrintCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/UseStdPrintCheck.cpp
@@ -12,7 +12,6 @@
#include "../utils/OptionsUtils.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Lex/Lexer.h"
-#include "clang/Tooling/FixIt.h"
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/modernize/UseTransparentFunctorsCheck.cpp
b/clang-tools-extra/clang-tidy/modernize/UseTransparentFunctorsCheck.cpp
index 2223a1999f736..a053c07f95ce2 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseTransparentFunctorsCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/UseTransparentFunctorsCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "UseTransparentFunctorsCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/modernize/UseUncaughtExceptionsCheck.cpp
b/clang-tools-extra/clang-tidy/modernize/UseUncaughtExceptionsCheck.cpp
index cffb931afa2d8..109d701395cc4 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseUncaughtExceptionsCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/UseUncaughtExceptionsCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "UseUncaughtExceptionsCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Lex/Lexer.h"
diff --git a/clang-tools-extra/clang-tidy/objc/AvoidNSErrorInitCheck.cpp
b/clang-tools-extra/clang-tidy/objc/AvoidNSErrorInitCheck.cpp
index 3624cab10a509..0de9584ad4806 100644
--- a/clang-tools-extra/clang-tidy/objc/AvoidNSErrorInitCheck.cpp
+++ b/clang-tools-extra/clang-tidy/objc/AvoidNSErrorInitCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "AvoidNSErrorInitCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/objc/ForbiddenSubclassingCheck.cpp
b/clang-tools-extra/clang-tidy/objc/ForbiddenSubclassingCheck.cpp
index 21ba41d66458d..579aa29650715 100644
--- a/clang-tools-extra/clang-tidy/objc/ForbiddenSubclassingCheck.cpp
+++ b/clang-tools-extra/clang-tidy/objc/ForbiddenSubclassingCheck.cpp
@@ -10,8 +10,6 @@
#include "../utils/OptionsUtils.h"
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "llvm/ADT/Hashing.h"
-#include "llvm/ADT/SmallVector.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/objc/NSDateFormatterCheck.cpp
b/clang-tools-extra/clang-tidy/objc/NSDateFormatterCheck.cpp
index fe18958ded1fd..5438c9c892e2e 100644
--- a/clang-tools-extra/clang-tidy/objc/NSDateFormatterCheck.cpp
+++ b/clang-tools-extra/clang-tidy/objc/NSDateFormatterCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "NSDateFormatterCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
diff --git a/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.cpp
b/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.cpp
index 07904350dc26c..cda24de491867 100644
--- a/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.cpp
+++ b/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.cpp
@@ -7,14 +7,9 @@
//===----------------------------------------------------------------------===//
#include "PropertyDeclarationCheck.h"
-#include "../utils/OptionsUtils.h"
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Basic/CharInfo.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringExtras.h"
#include "llvm/Support/Regex.h"
-#include <algorithm>
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/openmp/ExceptionEscapeCheck.cpp
b/clang-tools-extra/clang-tidy/openmp/ExceptionEscapeCheck.cpp
index 64ca212473e10..603d0954e1b19 100644
--- a/clang-tools-extra/clang-tidy/openmp/ExceptionEscapeCheck.cpp
+++ b/clang-tools-extra/clang-tidy/openmp/ExceptionEscapeCheck.cpp
@@ -7,13 +7,10 @@
//===----------------------------------------------------------------------===//
#include "ExceptionEscapeCheck.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/OpenMPClause.h"
#include "clang/AST/Stmt.h"
#include "clang/AST/StmtOpenMP.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/ASTMatchers/ASTMatchersMacros.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/openmp/UseDefaultNoneCheck.cpp
b/clang-tools-extra/clang-tidy/openmp/UseDefaultNoneCheck.cpp
index 8977a58a8b6ca..e1c353fbe65e0 100644
--- a/clang-tools-extra/clang-tidy/openmp/UseDefaultNoneCheck.cpp
+++ b/clang-tools-extra/clang-tidy/openmp/UseDefaultNoneCheck.cpp
@@ -7,13 +7,10 @@
//===----------------------------------------------------------------------===//
#include "UseDefaultNoneCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/AST/OpenMPClause.h"
-#include "clang/AST/Stmt.h"
#include "clang/AST/StmtOpenMP.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/ASTMatchers/ASTMatchersMacros.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/performance/ForRangeCopyCheck.cpp
b/clang-tools-extra/clang-tidy/performance/ForRangeCopyCheck.cpp
index f7d44bf863141..f545a49dc184b 100644
--- a/clang-tools-extra/clang-tidy/performance/ForRangeCopyCheck.cpp
+++ b/clang-tools-extra/clang-tidy/performance/ForRangeCopyCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "ForRangeCopyCheck.h"
-#include "../utils/DeclRefExprUtils.h"
#include "../utils/FixItHintUtils.h"
#include "../utils/Matchers.h"
#include "../utils/OptionsUtils.h"
diff --git
a/clang-tools-extra/clang-tidy/performance/InefficientStringConcatenationCheck.cpp
b/clang-tools-extra/clang-tidy/performance/InefficientStringConcatenationCheck.cpp
index 9e4e3f63e19cf..2b1e67d1d4a2f 100644
---
a/clang-tools-extra/clang-tidy/performance/InefficientStringConcatenationCheck.cpp
+++
b/clang-tools-extra/clang-tidy/performance/InefficientStringConcatenationCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "InefficientStringConcatenationCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/performance/MoveConstructorInitCheck.cpp
b/clang-tools-extra/clang-tidy/performance/MoveConstructorInitCheck.cpp
index 0f47b40280b2b..1585a0ae36f9c 100644
--- a/clang-tools-extra/clang-tidy/performance/MoveConstructorInitCheck.cpp
+++ b/clang-tools-extra/clang-tidy/performance/MoveConstructorInitCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "MoveConstructorInitCheck.h"
-#include "../utils/Matchers.h"
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
diff --git a/clang-tools-extra/clang-tidy/performance/NoIntToPtrCheck.cpp
b/clang-tools-extra/clang-tidy/performance/NoIntToPtrCheck.cpp
index f7a56c7b10c8a..bf212595aceaf 100644
--- a/clang-tools-extra/clang-tidy/performance/NoIntToPtrCheck.cpp
+++ b/clang-tools-extra/clang-tidy/performance/NoIntToPtrCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "NoIntToPtrCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/performance/UnnecessaryCopyInitialization.cpp
b/clang-tools-extra/clang-tidy/performance/UnnecessaryCopyInitialization.cpp
index dc2e8a38a3e97..ce360dded8633 100644
--- a/clang-tools-extra/clang-tidy/performance/UnnecessaryCopyInitialization.cpp
+++ b/clang-tools-extra/clang-tidy/performance/UnnecessaryCopyInitialization.cpp
@@ -15,7 +15,6 @@
#include "clang/AST/Decl.h"
#include "clang/Basic/Diagnostic.h"
#include <optional>
-#include <utility>
namespace clang::tidy::performance {
namespace {
diff --git a/clang-tools-extra/clang-tidy/plugin/ClangTidyPlugin.cpp
b/clang-tools-extra/clang-tidy/plugin/ClangTidyPlugin.cpp
index 8c98ba7b9238a..3caa222b9fa4c 100644
--- a/clang-tools-extra/clang-tidy/plugin/ClangTidyPlugin.cpp
+++ b/clang-tools-extra/clang-tidy/plugin/ClangTidyPlugin.cpp
@@ -8,7 +8,6 @@
#include "../ClangTidy.h"
#include "../ClangTidyDiagnosticConsumer.h"
-#include "../ClangTidyForceLinker.h"
#include "../ClangTidyModule.h"
#include "clang/Frontend/CompilerInstance.h"
#include "clang/Frontend/FrontendPluginRegistry.h"
diff --git a/clang-tools-extra/clang-tidy/portability/SIMDIntrinsicsCheck.cpp
b/clang-tools-extra/clang-tidy/portability/SIMDIntrinsicsCheck.cpp
index 3e77a204d753e..f4bd4c3d5657d 100644
--- a/clang-tools-extra/clang-tidy/portability/SIMDIntrinsicsCheck.cpp
+++ b/clang-tools-extra/clang-tidy/portability/SIMDIntrinsicsCheck.cpp
@@ -10,8 +10,6 @@
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Basic/TargetInfo.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/Regex.h"
#include "llvm/TargetParser/Triple.h"
diff --git
a/clang-tools-extra/clang-tidy/readability/FunctionCognitiveComplexityCheck.cpp
b/clang-tools-extra/clang-tidy/readability/FunctionCognitiveComplexityCheck.cpp
index d8cfea534e55f..e1fb42b8210e2 100644
---
a/clang-tools-extra/clang-tidy/readability/FunctionCognitiveComplexityCheck.cpp
+++
b/clang-tools-extra/clang-tidy/readability/FunctionCognitiveComplexityCheck.cpp
@@ -21,15 +21,12 @@
#include "clang/Basic/LLVM.h"
#include "clang/Basic/SourceLocation.h"
#include "llvm/ADT/STLForwardCompat.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/Support/Casting.h"
#include "llvm/Support/ErrorHandling.h"
#include <array>
#include <cassert>
#include <optional>
#include <stack>
#include <tuple>
-#include <type_traits>
#include <utility>
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/readability/IdentifierLengthCheck.cpp
b/clang-tools-extra/clang-tidy/readability/IdentifierLengthCheck.cpp
index 68da28b7f1a3c..50f8a6be06e46 100644
--- a/clang-tools-extra/clang-tidy/readability/IdentifierLengthCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/IdentifierLengthCheck.cpp
@@ -8,8 +8,6 @@
//===----------------------------------------------------------------------===//
#include "IdentifierLengthCheck.h"
-#include "../utils/OptionsUtils.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp
b/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp
index 04040d580b6f1..fab2365f1147a 100644
--- a/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp
@@ -14,10 +14,8 @@
#include "clang/Lex/PPCallbacks.h"
#include "clang/Lex/Preprocessor.h"
#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/DenseMapInfo.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Debug.h"
-#include "llvm/Support/Error.h"
#include "llvm/Support/FormatVariadic.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/Regex.h"
diff --git
a/clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp
b/clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp
index a60a4faa32a16..5cc22a22b1f50 100644
---
a/clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp
+++
b/clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp
@@ -7,12 +7,9 @@
//===----------------------------------------------------------------------===//
#include "InconsistentDeclarationParameterNameCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "llvm/ADT/STLExtras.h"
-#include <functional>
-
using namespace clang::ast_matchers;
namespace clang::tidy::readability {
diff --git a/clang-tools-extra/clang-tidy/readability/MagicNumbersCheck.cpp
b/clang-tools-extra/clang-tidy/readability/MagicNumbersCheck.cpp
index f8fd5e91d90d1..6f91527c420e8 100644
--- a/clang-tools-extra/clang-tidy/readability/MagicNumbersCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/MagicNumbersCheck.cpp
@@ -18,7 +18,6 @@
#include "clang/AST/Type.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "llvm/ADT/STLExtras.h"
-#include <algorithm>
using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/readability/NamespaceCommentCheck.cpp
b/clang-tools-extra/clang-tidy/readability/NamespaceCommentCheck.cpp
index 120ec02e9ad7d..64dc941569a96 100644
--- a/clang-tools-extra/clang-tidy/readability/NamespaceCommentCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/NamespaceCommentCheck.cpp
@@ -13,7 +13,6 @@
#include "clang/Basic/SourceLocation.h"
#include "clang/Basic/TokenKinds.h"
#include "clang/Lex/Lexer.h"
-#include "llvm/ADT/StringExtras.h"
#include <optional>
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/readability/RedundantControlFlowCheck.cpp
b/clang-tools-extra/clang-tidy/readability/RedundantControlFlowCheck.cpp
index ed01d3a2d7a71..70016a372b8bd 100644
--- a/clang-tools-extra/clang-tidy/readability/RedundantControlFlowCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/RedundantControlFlowCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "RedundantControlFlowCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Lex/Lexer.h"
diff --git
a/clang-tools-extra/clang-tidy/readability/RedundantFunctionPtrDereferenceCheck.cpp
b/clang-tools-extra/clang-tidy/readability/RedundantFunctionPtrDereferenceCheck.cpp
index 247d287be2b36..44053ebd21dc4 100644
---
a/clang-tools-extra/clang-tidy/readability/RedundantFunctionPtrDereferenceCheck.cpp
+++
b/clang-tools-extra/clang-tidy/readability/RedundantFunctionPtrDereferenceCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "RedundantFunctionPtrDereferenceCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
using namespace clang::ast_matchers;
diff --git
a/clang-tools-extra/clang-tidy/readability/RedundantMemberInitCheck.cpp
b/clang-tools-extra/clang-tidy/readability/RedundantMemberInitCheck.cpp
index 601ff44cdd10a..2373dde1618bc 100644
--- a/clang-tools-extra/clang-tidy/readability/RedundantMemberInitCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/RedundantMemberInitCheck.cpp
@@ -12,7 +12,6 @@
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Lex/Lexer.h"
-#include <algorithm>
using namespace clang::ast_matchers;
using namespace clang::tidy::matchers;
diff --git
a/clang-tools-extra/clang-tidy/readability/StaticDefinitionInAnonymousNamespaceCheck.cpp
b/clang-tools-extra/clang-tidy/readability/StaticDefinitionInAnonymousNamespaceCheck.cpp
index 3e6bb01b55f9c..a0f59dbcb4890 100644
---
a/clang-tools-extra/clang-tidy/readability/StaticDefinitionInAnonymousNamespaceCheck.cpp
+++
b/clang-tools-extra/clang-tidy/readability/StaticDefinitionInAnonymousNamespaceCheck.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "StaticDefinitionInAnonymousNamespaceCheck.h"
-#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Lex/Lexer.h"
diff --git
a/clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp
b/clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp
index c5eaff88e0ed3..9db059c26d6f2 100644
--- a/clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp
@@ -12,7 +12,6 @@
#include "clang/AST/Type.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include <optional>
-#include <sstream>
using namespace clang::ast_matchers;
namespace optutils = clang::tidy::utils::options;
diff --git
a/clang-tools-extra/clang-tidy/readability/UppercaseLiteralSuffixCheck.cpp
b/clang-tools-extra/clang-tidy/readability/UppercaseLiteralSuffixCheck.cpp
index 66b5f3922789d..678aa8dad48a7 100644
--- a/clang-tools-extra/clang-tidy/readability/UppercaseLiteralSuffixCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/UppercaseLiteralSuffixCheck.cpp
@@ -11,7 +11,6 @@
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Lex/Lexer.h"
-#include "llvm/ADT/SmallString.h"
#include <cctype>
#include <optional>
diff --git a/clang-tools-extra/clang-tidy/utils/HeaderGuard.cpp
b/clang-tools-extra/clang-tidy/utils/HeaderGuard.cpp
index f574c94e6f144..5b38ace13e2f2 100644
--- a/clang-tools-extra/clang-tidy/utils/HeaderGuard.cpp
+++ b/clang-tools-extra/clang-tidy/utils/HeaderGuard.cpp
@@ -10,7 +10,6 @@
#include "clang/Frontend/CompilerInstance.h"
#include "clang/Lex/PPCallbacks.h"
#include "clang/Lex/Preprocessor.h"
-#include "clang/Tooling/Tooling.h"
#include "llvm/Support/Path.h"
namespace clang::tidy::utils {
diff --git a/clang-tools-extra/clang-tidy/utils/TypeTraits.cpp
b/clang-tools-extra/clang-tidy/utils/TypeTraits.cpp
index 270b438c00c18..68574d22d15f7 100644
--- a/clang-tools-extra/clang-tidy/utils/TypeTraits.cpp
+++ b/clang-tools-extra/clang-tidy/utils/TypeTraits.cpp
@@ -9,7 +9,6 @@
#include "TypeTraits.h"
#include "clang/AST/ASTContext.h"
#include "clang/AST/DeclCXX.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
#include <optional>
namespace clang::tidy::utils::type_traits {
diff --git a/clang-tools-extra/clang-tidy/utils/UseRangesCheck.cpp
b/clang-tools-extra/clang-tidy/utils/UseRangesCheck.cpp
index f7a19cd72d500..16ee7ee79d75e 100644
--- a/clang-tools-extra/clang-tidy/utils/UseRangesCheck.cpp
+++ b/clang-tools-extra/clang-tidy/utils/UseRangesCheck.cpp
@@ -22,7 +22,6 @@
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallBitVector.h"
-#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/Twine.h"
diff --git a/clang-tools-extra/clang-tidy/zircon/TemporaryObjectsCheck.cpp
b/clang-tools-extra/clang-tidy/zircon/TemporaryObjectsCheck.cpp
index 240bb4ee2919a..bb2976081a692 100644
--- a/clang-tools-extra/clang-tidy/zircon/TemporaryObjectsCheck.cpp
+++ b/clang-tools-extra/clang-tidy/zircon/TemporaryObjectsCheck.cpp
@@ -11,7 +11,6 @@
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SmallVector.h"
#include <string>
using namespace clang::ast_matchers;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
