diff --git a/bolt/lib/Target/AArch64/CMakeLists.txt b/bolt/lib/Target/AArch64/CMakeLists.txt
--- a/bolt/lib/Target/AArch64/CMakeLists.txt
+++ b/bolt/lib/Target/AArch64/CMakeLists.txt
@@ -3,7 +3,6 @@
   MC
   Object
   Support
-  ${LLVM_TARGETS_TO_BUILD}
   )
 
 add_llvm_library(LLVMBOLTTargetAArch64
diff --git a/bolt/lib/Target/X86/CMakeLists.txt b/bolt/lib/Target/X86/CMakeLists.txt
--- a/bolt/lib/Target/X86/CMakeLists.txt
+++ b/bolt/lib/Target/X86/CMakeLists.txt
@@ -1,9 +1,7 @@
 set(LLVM_LINK_COMPONENTS
   BOLTCore
   MC
-  Object
   Support
-  ${LLVM_TARGETS_TO_BUILD}
   )
 
 add_llvm_library(LLVMBOLTTargetX86
diff --git a/bolt/tools/heatmap/CMakeLists.txt b/bolt/tools/heatmap/CMakeLists.txt
--- a/bolt/tools/heatmap/CMakeLists.txt
+++ b/bolt/tools/heatmap/CMakeLists.txt
@@ -1,9 +1,7 @@
 set(LLVM_LINK_COMPONENTS
   ${LLVM_TARGETS_TO_BUILD}
-  BOLTProfile
   BOLTRewrite
   BOLTUtils
-  MC
   Object
   Support
   )
diff --git a/clang-tools-extra/clang-apply-replacements/CMakeLists.txt b/clang-tools-extra/clang-apply-replacements/CMakeLists.txt
--- a/clang-tools-extra/clang-apply-replacements/CMakeLists.txt
+++ b/clang-tools-extra/clang-apply-replacements/CMakeLists.txt
@@ -8,9 +8,7 @@
 
 clang_target_link_libraries(clangApplyReplacements
   PRIVATE
-  clangAST
   clangBasic
-  clangRewrite
   clangToolingCore
   clangToolingRefactoring
   )
diff --git a/clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt b/clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt
--- a/clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt
+++ b/clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt
@@ -9,9 +9,6 @@
   PRIVATE
   clangBasic
   clangFormat
-  clangRewrite
-  clangToolingCore
-  clangToolingRefactoring
   )
 target_link_libraries(clang-apply-replacements
   PRIVATE
diff --git a/clang-tools-extra/clang-change-namespace/CMakeLists.txt b/clang-tools-extra/clang-change-namespace/CMakeLists.txt
--- a/clang-tools-extra/clang-change-namespace/CMakeLists.txt
+++ b/clang-tools-extra/clang-change-namespace/CMakeLists.txt
@@ -16,10 +16,7 @@
   clangASTMatchers
   clangBasic
   clangFormat
-  clangFrontend
   clangLex
-  clangSerialization
-  clangTooling
   clangToolingCore
   )
 
diff --git a/clang-tools-extra/clang-change-namespace/tool/CMakeLists.txt b/clang-tools-extra/clang-change-namespace/tool/CMakeLists.txt
--- a/clang-tools-extra/clang-change-namespace/tool/CMakeLists.txt
+++ b/clang-tools-extra/clang-change-namespace/tool/CMakeLists.txt
@@ -13,12 +13,10 @@
   clangAST
   clangASTMatchers
   clangBasic
-  clangFormat
   clangFrontend
   clangRewrite
   clangSerialization
   clangTooling
-  clangToolingCore
   )
 target_link_libraries(clang-change-namespace
   PRIVATE
diff --git a/clang-tools-extra/clang-doc/CMakeLists.txt b/clang-tools-extra/clang-doc/CMakeLists.txt
--- a/clang-tools-extra/clang-doc/CMakeLists.txt
+++ b/clang-tools-extra/clang-doc/CMakeLists.txt
@@ -1,9 +1,3 @@
-set(LLVM_LINK_COMPONENTS
-  support
-  BitstreamReader
-  FrontendOpenMP
-  )
-
 add_clang_library(clangDoc
   BitcodeReader.cpp
   BitcodeWriter.cpp
@@ -16,21 +10,21 @@
   Serialize.cpp
   YAMLGenerator.cpp
 
+  LINK_COMPONENTS
+  support
+  BitstreamReader
+
   DEPENDS
   omp_gen
 )
 
 clang_target_link_libraries(clangDoc
   PRIVATE
-  clangAnalysis
   clangAST
-  clangASTMatchers
   clangBasic
   clangFrontend
   clangIndex
-  clangLex
   clangTooling
-  clangToolingCore
   )
 
 add_subdirectory(tool)
diff --git a/clang-tools-extra/clang-doc/tool/CMakeLists.txt b/clang-tools-extra/clang-doc/tool/CMakeLists.txt
--- a/clang-tools-extra/clang-doc/tool/CMakeLists.txt
+++ b/clang-tools-extra/clang-doc/tool/CMakeLists.txt
@@ -1,5 +1,10 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
+set(LLVM_LINK_COMPONENTS
+  support
+  FrontendOpenMP
+  )
+
 add_clang_tool(clang-doc
   ClangDocMain.cpp
   )
@@ -9,9 +14,7 @@
   clangAST
   clangASTMatchers
   clangBasic
-  clangFrontend
   clangTooling
-  clangToolingCore
   )
 target_link_libraries(clang-doc
   PRIVATE
diff --git a/clang-tools-extra/clang-include-fixer/CMakeLists.txt b/clang-tools-extra/clang-include-fixer/CMakeLists.txt
--- a/clang-tools-extra/clang-include-fixer/CMakeLists.txt
+++ b/clang-tools-extra/clang-include-fixer/CMakeLists.txt
@@ -26,7 +26,6 @@
   clangLex
   clangParse
   clangSema
-  clangSerialization
   clangTooling
   clangToolingCore
   )
diff --git a/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/CMakeLists.txt b/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/CMakeLists.txt
--- a/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/CMakeLists.txt
+++ b/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/CMakeLists.txt
@@ -9,8 +9,6 @@
   clangAST
   clangASTMatchers
   clangBasic
-  clangFrontend
-  clangLex
   clangSerialization
   clangTooling
   )
diff --git a/clang-tools-extra/clang-include-fixer/plugin/CMakeLists.txt b/clang-tools-extra/clang-include-fixer/plugin/CMakeLists.txt
--- a/clang-tools-extra/clang-include-fixer/plugin/CMakeLists.txt
+++ b/clang-tools-extra/clang-include-fixer/plugin/CMakeLists.txt
@@ -3,10 +3,8 @@
 
   LINK_LIBS
   clangAST
-  clangBasic
   clangFrontend
   clangIncludeFixer
-  clangParse
   clangSema
   clangTooling
   ${LLVM_PTHREAD_LIB}
diff --git a/clang-tools-extra/clang-move/CMakeLists.txt b/clang-tools-extra/clang-move/CMakeLists.txt
--- a/clang-tools-extra/clang-move/CMakeLists.txt
+++ b/clang-tools-extra/clang-move/CMakeLists.txt
@@ -20,8 +20,6 @@
   clangFormat
   clangFrontend
   clangLex
-  clangSerialization
-  clangTooling
   clangToolingCore
   )
 
diff --git a/clang-tools-extra/clang-move/tool/CMakeLists.txt b/clang-tools-extra/clang-move/tool/CMakeLists.txt
--- a/clang-tools-extra/clang-move/tool/CMakeLists.txt
+++ b/clang-tools-extra/clang-move/tool/CMakeLists.txt
@@ -9,12 +9,10 @@
   clangAST
   clangASTMatchers
   clangBasic
-  clangFormat
   clangFrontend
   clangRewrite
   clangSerialization
   clangTooling
-  clangToolingCore
   )
 target_link_libraries(clang-move
   PRIVATE
diff --git a/clang-tools-extra/clang-query/CMakeLists.txt b/clang-tools-extra/clang-query/CMakeLists.txt
--- a/clang-tools-extra/clang-query/CMakeLists.txt
+++ b/clang-tools-extra/clang-query/CMakeLists.txt
@@ -1,13 +1,11 @@
-set(LLVM_LINK_COMPONENTS
-  lineeditor
-  support
-  FrontendOpenMP
-  )
-
 add_clang_library(clangQuery
   Query.cpp
   QueryParser.cpp
 
+  LINK_COMPONENTS
+  support
+  FrontendOpenMP
+
   DEPENDS
   omp_gen
   )
@@ -20,7 +18,6 @@
   clangDynamicASTMatchers
   clangFrontend
   clangTooling
-  clangSerialization
   )
 
 add_subdirectory(tool)
diff --git a/clang-tools-extra/clang-query/tool/CMakeLists.txt b/clang-tools-extra/clang-query/tool/CMakeLists.txt
--- a/clang-tools-extra/clang-query/tool/CMakeLists.txt
+++ b/clang-tools-extra/clang-query/tool/CMakeLists.txt
@@ -1,5 +1,11 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
+set(LLVM_LINK_COMPONENTS
+  lineeditor
+  support
+  FrontendOpenMP
+  )
+
 add_clang_tool(clang-query
   ClangQuery.cpp
   )
diff --git a/clang-tools-extra/clang-reorder-fields/CMakeLists.txt b/clang-tools-extra/clang-reorder-fields/CMakeLists.txt
--- a/clang-tools-extra/clang-reorder-fields/CMakeLists.txt
+++ b/clang-tools-extra/clang-reorder-fields/CMakeLists.txt
@@ -1,11 +1,10 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  support
-)
-
 add_clang_library(clangReorderFields
   ReorderFieldsAction.cpp
 
+  LINK_COMPONENTS
+  FrontendOpenMP
+  support
+
   DEPENDS
   omp_gen
 )
@@ -15,9 +14,7 @@
   clangAST
   clangASTMatchers
   clangBasic
-  clangIndex
   clangLex
-  clangSerialization
   clangToolingCore
   )
 
diff --git a/clang-tools-extra/clang-reorder-fields/tool/CMakeLists.txt b/clang-tools-extra/clang-reorder-fields/tool/CMakeLists.txt
--- a/clang-tools-extra/clang-reorder-fields/tool/CMakeLists.txt
+++ b/clang-tools-extra/clang-reorder-fields/tool/CMakeLists.txt
@@ -1,3 +1,7 @@
+set(LLVM_LINK_COMPONENTS
+  support
+  )
+
 add_clang_tool(clang-reorder-fields
   ClangReorderFields.cpp
   )
@@ -9,7 +13,6 @@
   clangRewrite
   clangSerialization
   clangTooling
-  clangToolingCore
   )
 target_link_libraries(clang-reorder-fields
   PRIVATE
diff --git a/clang-tools-extra/clang-tidy/CMakeLists.txt b/clang-tools-extra/clang-tidy/CMakeLists.txt
--- a/clang-tools-extra/clang-tidy/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/clang-tidy-config.h.cmake
   ${CMAKE_CURRENT_BINARY_DIR}/clang-tidy-config.h)
@@ -19,6 +14,10 @@
   GlobList.cpp
   NoLintDirectiveHandler.cpp
 
+  LINK_COMPONENTS
+  FrontendOpenMP
+  Support
+
   DEPENDS
   ClangSACheckers
   omp_gen
@@ -43,7 +42,6 @@
 if(CLANG_TIDY_ENABLE_STATIC_ANALYZER)
   clang_target_link_libraries(clangTidy
     PRIVATE
-    clangStaticAnalyzerCore
     clangStaticAnalyzerFrontend
   )
 endif()
diff --git a/clang-tools-extra/clang-tidy/altera/CMakeLists.txt b/clang-tools-extra/clang-tidy/altera/CMakeLists.txt
--- a/clang-tools-extra/clang-tidy/altera/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/altera/CMakeLists.txt
@@ -13,12 +13,10 @@
 
   LINK_LIBS
   clangTidy
-  clangTidyUtils
   )
 
 clang_target_link_libraries(clangTidyAlteraModule
   PRIVATE
-  clangAnalysis
   clangAST
   clangASTMatchers
   clangBasic
diff --git a/clang-tools-extra/clang-tidy/boost/CMakeLists.txt b/clang-tools-extra/clang-tidy/boost/CMakeLists.txt
--- a/clang-tools-extra/clang-tidy/boost/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/boost/CMakeLists.txt
@@ -9,7 +9,6 @@
 
   LINK_LIBS
   clangTidy
-  clangTidyUtils
 
   DEPENDS
   omp_gen
@@ -20,5 +19,4 @@
   clangAST
   clangASTMatchers
   clangBasic
-  clangLex
   )
diff --git a/clang-tools-extra/clang-tidy/concurrency/CMakeLists.txt b/clang-tools-extra/clang-tidy/concurrency/CMakeLists.txt
--- a/clang-tools-extra/clang-tidy/concurrency/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/concurrency/CMakeLists.txt
@@ -10,16 +10,11 @@
 
   LINK_LIBS
   clangTidy
-  clangTidyUtils
   )
 
 clang_target_link_libraries(clangTidyConcurrencyModule
   PRIVATE
-  clangAnalysis
   clangAST
   clangASTMatchers
   clangBasic
-  clangLex
-  clangSerialization
-  clangTooling
   )
diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt b/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt
--- a/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt
@@ -45,6 +45,4 @@
   clangASTMatchers
   clangBasic
   clangLex
-  clangSerialization
-  clangTooling
   )
diff --git a/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt b/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt
--- a/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt
@@ -10,7 +10,6 @@
 
   LINK_LIBS
   clangTidy
-  clangTidyUtils
 
   DEPENDS
   omp_gen
@@ -18,9 +17,7 @@
 
 clang_target_link_libraries(clangTidyDarwinModule
   PRIVATE
-  clangAnalysis
   clangAST
   clangASTMatchers
   clangBasic
-  clangLex
   )
diff --git a/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt b/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt
--- a/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt
@@ -16,7 +16,6 @@
   LINK_LIBS
   clangTidy
   clangTidyGoogleModule
-  clangTidyUtils
 
   DEPENDS
   omp_gen
diff --git a/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt b/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt
--- a/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt
@@ -19,7 +19,6 @@
   clangTidyModernizeModule
   clangTidyPerformanceModule
   clangTidyReadabilityModule
-  clangTidyUtils
 
   DEPENDS
   omp_gen
@@ -30,6 +29,4 @@
   clangAST
   clangASTMatchers
   clangBasic
-  clangLex
-  clangSerialization
   )
diff --git a/clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt b/clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt
--- a/clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt
@@ -9,7 +9,6 @@
 
   LINK_LIBS
   clangTidy
-  clangTidyUtils
 
   DEPENDS
   omp_gen
@@ -20,5 +19,4 @@
   clangAST
   clangASTMatchers
   clangBasic
-  clangLex
   )
diff --git a/clang-tools-extra/clang-tidy/llvmlibc/CMakeLists.txt b/clang-tools-extra/clang-tidy/llvmlibc/CMakeLists.txt
--- a/clang-tools-extra/clang-tidy/llvmlibc/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/llvmlibc/CMakeLists.txt
@@ -12,7 +12,6 @@
   LINK_LIBS
   clangTidy
   clangTidyPortabilityModule
-  clangTidyUtils
 
   DEPENDS
   omp_gen
@@ -24,5 +23,4 @@
   clangASTMatchers
   clangBasic
   clangLex
-  clangTooling
   )
diff --git a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
--- a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
@@ -37,6 +37,4 @@
   clangASTMatchers
   clangBasic
   clangLex
-  clangSerialization
-  clangTooling
   )
diff --git a/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt b/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt
--- a/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt
@@ -41,7 +41,6 @@
 
   LINK_LIBS
   clangTidy
-  clangTidyReadabilityModule
   clangTidyUtils
 
   DEPENDS
diff --git a/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt b/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt
--- a/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt
@@ -10,7 +10,6 @@
 
   LINK_LIBS
   clangTidy
-  clangTidyUtils
 
   DEPENDS
   omp_gen
@@ -18,11 +17,9 @@
 
 clang_target_link_libraries(clangTidyMPIModule
   PRIVATE
-  clangAnalysis
   clangAST
   clangASTMatchers
   clangBasic
-  clangLex
   clangTooling
   clangStaticAnalyzerCheckers
   )
diff --git a/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt b/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt
--- a/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt
@@ -1,6 +1,9 @@
 add_clang_library(clangTidyPlugin
   ClangTidyPlugin.cpp
 
+  LINK_COMPONENTS
+  Support
+
   LINK_LIBS
   clangTidy
   ${ALL_CLANG_TIDY_CHECKS}
@@ -11,10 +14,7 @@
 
 clang_target_link_libraries(clangTidyPlugin
   PRIVATE
-  clangAST
-  clangASTMatchers
   clangBasic
   clangFrontend
   clangSema
-  clangTooling
   )
diff --git a/clang-tools-extra/clang-tidy/portability/CMakeLists.txt b/clang-tools-extra/clang-tidy/portability/CMakeLists.txt
--- a/clang-tools-extra/clang-tidy/portability/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/portability/CMakeLists.txt
@@ -10,7 +10,6 @@
 
   LINK_LIBS
   clangTidy
-  clangTidyUtils
 
   DEPENDS
   omp_gen
@@ -22,5 +21,4 @@
   clangASTMatchers
   clangBasic
   clangLex
-  clangTooling
   )
diff --git a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
--- a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
@@ -2,7 +2,6 @@
   AllTargetsAsmParsers
   AllTargetsDescs
   AllTargetsInfos
-  FrontendOpenMP
   support
   )
 
@@ -22,11 +21,7 @@
 
 clang_target_link_libraries(clangTidyMain
   PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
   clangTooling
-  clangToolingCore
   )
 
 # Support plugins.
diff --git a/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt b/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt
--- a/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt
@@ -20,5 +20,4 @@
   clangAST
   clangASTMatchers
   clangBasic
-  clangLex
   )
diff --git a/clang-tools-extra/clangd/CMakeLists.txt b/clang-tools-extra/clangd/CMakeLists.txt
--- a/clang-tools-extra/clangd/CMakeLists.txt
+++ b/clang-tools-extra/clangd/CMakeLists.txt
@@ -36,13 +36,6 @@
   ${CMAKE_CURRENT_BINARY_DIR}/Features.inc
 )
 
-set(LLVM_LINK_COMPONENTS
-  Support
-  AllTargetsInfos
-  FrontendOpenMP
-  Option
-  )
-
 include(${CMAKE_CURRENT_SOURCE_DIR}/quality/CompletionModel.cmake)
 gen_decision_forest(${CMAKE_CURRENT_SOURCE_DIR}/quality/model CompletionModel clang::clangd::Example)
 
@@ -137,6 +130,11 @@
 
   DEPENDS
   omp_gen
+
+  LINK_COMPONENTS
+  FrontendOpenMP
+  Option
+  Support
   )
 
 # Include generated CompletionModel headers.
diff --git a/clang-tools-extra/clangd/fuzzer/CMakeLists.txt b/clang-tools-extra/clangd/fuzzer/CMakeLists.txt
--- a/clang-tools-extra/clangd/fuzzer/CMakeLists.txt
+++ b/clang-tools-extra/clangd/fuzzer/CMakeLists.txt
@@ -9,15 +9,6 @@
   DUMMY_MAIN FuzzerClangdMain.cpp
   )
 
-clang_target_link_libraries(clangd-fuzzer
-  PRIVATE
-  clangBasic
-  clangFormat
-  clangFrontend
-  clangSema
-  clangTooling
-  clangToolingCore
-  )
 target_link_libraries(clangd-fuzzer
   PRIVATE
   clangDaemon
diff --git a/clang-tools-extra/clangd/index/dex/dexp/CMakeLists.txt b/clang-tools-extra/clangd/index/dex/dexp/CMakeLists.txt
--- a/clang-tools-extra/clangd/index/dex/dexp/CMakeLists.txt
+++ b/clang-tools-extra/clangd/index/dex/dexp/CMakeLists.txt
@@ -7,10 +7,6 @@
   Dexp.cpp
   )
 
-clang_target_link_libraries(dexp
-  PRIVATE
-  clangBasic
-  )
 target_link_libraries(dexp
   PRIVATE
   clangDaemon
diff --git a/clang-tools-extra/clangd/index/remote/unimplemented/CMakeLists.txt b/clang-tools-extra/clangd/index/remote/unimplemented/CMakeLists.txt
--- a/clang-tools-extra/clangd/index/remote/unimplemented/CMakeLists.txt
+++ b/clang-tools-extra/clangd/index/remote/unimplemented/CMakeLists.txt
@@ -5,6 +5,9 @@
 add_clang_library(clangdRemoteIndex
   UnimplementedClient.cpp
 
+  LINK_COMPONENTS
+  Support
+
   LINK_LIBS
   clangdSupport
   )
diff --git a/clang-tools-extra/clangd/indexer/CMakeLists.txt b/clang-tools-extra/clangd/indexer/CMakeLists.txt
--- a/clang-tools-extra/clangd/indexer/CMakeLists.txt
+++ b/clang-tools-extra/clangd/indexer/CMakeLists.txt
@@ -8,11 +8,7 @@
 
 clang_target_link_libraries(clangd-indexer
   PRIVATE
-  clangAST
   clangBasic
-  clangFrontend
-  clangIndex
-  clangLex
   clangTooling
 )
 target_link_libraries(clangd-indexer
diff --git a/clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt b/clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt
--- a/clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt
+++ b/clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt
@@ -32,7 +32,6 @@
   clangBasic
   clangDaemon
   clangdSupport
-  clangFormat
   clangLex
   clangToolingCore
   clangToolingRefactoring
diff --git a/clang-tools-extra/clangd/tool/CMakeLists.txt b/clang-tools-extra/clangd/tool/CMakeLists.txt
--- a/clang-tools-extra/clangd/tool/CMakeLists.txt
+++ b/clang-tools-extra/clangd/tool/CMakeLists.txt
@@ -1,13 +1,14 @@
+set(LLVM_LINK_COMPONENTS
+  AllTargetsInfos
+  support
+  )
+
 add_clang_tool(clangd
   ClangdMain.cpp
   Check.cpp
   $<TARGET_OBJECTS:obj.clangDaemonTweaks>
   )
 
-set(LLVM_LINK_COMPONENTS
-  support
-  )
-
 set(CLANGD_XPC_LIBS "")
 if(CLANGD_BUILD_XPC)
   list(APPEND CLANGD_XPC_LIBS "clangdXpcJsonConversions" "clangdXpcTransport")
@@ -20,8 +21,6 @@
   clangFormat
   clangFrontend
   clangLex
-  clangSema
-  clangTooling
   clangToolingCore
   clangToolingRefactoring
   clangToolingSyntax
@@ -29,8 +28,6 @@
 
 target_link_libraries(clangd
   PRIVATE
-  clangTidy
-
   clangDaemon
   clangdRemoteIndex
   clangdSupport
diff --git a/clang/lib/APINotes/CMakeLists.txt b/clang/lib/APINotes/CMakeLists.txt
--- a/clang/lib/APINotes/CMakeLists.txt
+++ b/clang/lib/APINotes/CMakeLists.txt
@@ -2,6 +2,4 @@
   Support)
 add_clang_library(clangAPINotes
   APINotesTypes.cpp
-  APINotesYAMLCompiler.cpp
-  LINK_LIBS
-    clangBasic)
+  APINotesYAMLCompiler.cpp)
diff --git a/clang/lib/AST/CMakeLists.txt b/clang/lib/AST/CMakeLists.txt
--- a/clang/lib/AST/CMakeLists.txt
+++ b/clang/lib/AST/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(LLVM_LINK_COMPONENTS
-  BinaryFormat
   Core
   FrontendOpenMP
   Support
diff --git a/clang/lib/Analysis/CMakeLists.txt b/clang/lib/Analysis/CMakeLists.txt
--- a/clang/lib/Analysis/CMakeLists.txt
+++ b/clang/lib/Analysis/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
 add_clang_library(clangAnalysis
   AnalysisDeclContext.cpp
   BodyFarm.cpp
@@ -33,6 +28,10 @@
   ThreadSafetyTIL.cpp
   UninitializedValues.cpp
 
+  LINK_COMPONENTS
+  FrontendOpenMP
+  Support
+
   LINK_LIBS
   clangAST
   clangASTMatchers
diff --git a/clang/lib/Analysis/FlowSensitive/CMakeLists.txt b/clang/lib/Analysis/FlowSensitive/CMakeLists.txt
--- a/clang/lib/Analysis/FlowSensitive/CMakeLists.txt
+++ b/clang/lib/Analysis/FlowSensitive/CMakeLists.txt
@@ -4,6 +4,9 @@
   Transfer.cpp
   TypeErasedDataflowAnalysis.cpp
 
+  LINK_COMPONENTS
+  Support
+
   LINK_LIBS
   clangAnalysis
   clangAST
diff --git a/clang/lib/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt b/clang/lib/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt
--- a/clang/lib/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt
+++ b/clang/lib/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt
@@ -7,7 +7,6 @@
 
 clang_target_link_libraries(CheckerDependencyHandlingAnalyzerPlugin PRIVATE
   clangAnalysis
-  clangAST
   clangStaticAnalyzerCore
   clangStaticAnalyzerFrontend
   )
diff --git a/clang/lib/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt b/clang/lib/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt
--- a/clang/lib/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt
+++ b/clang/lib/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt
@@ -7,7 +7,6 @@
 
 clang_target_link_libraries(CheckerOptionHandlingAnalyzerPlugin PRIVATE
   clangAnalysis
-  clangAST
   clangStaticAnalyzerCore
   clangStaticAnalyzerFrontend
   )
diff --git a/clang/lib/CodeGen/CMakeLists.txt b/clang/lib/CodeGen/CMakeLists.txt
--- a/clang/lib/CodeGen/CMakeLists.txt
+++ b/clang/lib/CodeGen/CMakeLists.txt
@@ -10,7 +10,6 @@
   FrontendOpenMP
   IPO
   IRReader
-  AggressiveInstCombine
   InstCombine
   Instrumentation
   LTO
@@ -20,7 +19,6 @@
   Object
   Passes
   ProfileData
-  Remarks
   ScalarOpts
   Support
   Target
@@ -89,7 +87,6 @@
   intrinsics_gen
 
   LINK_LIBS
-  clangAnalysis
   clangAST
   clangBasic
   clangFrontend
diff --git a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt
--- a/clang/lib/Driver/CMakeLists.txt
+++ b/clang/lib/Driver/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(LLVM_LINK_COMPONENTS
-  BinaryFormat
   MC
   Option
   ProfileData
diff --git a/clang/lib/Frontend/CMakeLists.txt b/clang/lib/Frontend/CMakeLists.txt
--- a/clang/lib/Frontend/CMakeLists.txt
+++ b/clang/lib/Frontend/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_subdirectory(Rewrite)
 
 set(LLVM_LINK_COMPONENTS
-  BitReader
   BitstreamReader
   Option
   ProfileData
diff --git a/clang/lib/Index/CMakeLists.txt b/clang/lib/Index/CMakeLists.txt
--- a/clang/lib/Index/CMakeLists.txt
+++ b/clang/lib/Index/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(LLVM_LINK_COMPONENTS
-  Core
   Support
   )
 
@@ -23,7 +22,6 @@
   clangFormat
   clangFrontend
   clangLex
-  clangRewrite
   clangSerialization
   clangToolingCore
 
diff --git a/clang/lib/IndexSerialization/CMakeLists.txt b/clang/lib/IndexSerialization/CMakeLists.txt
--- a/clang/lib/IndexSerialization/CMakeLists.txt
+++ b/clang/lib/IndexSerialization/CMakeLists.txt
@@ -4,7 +4,4 @@
 
 add_clang_library(clangIndexSerialization
   SerializablePathCollection.cpp
-
-  LINK_LIBS
-  clangBasic
   )
diff --git a/clang/lib/Interpreter/CMakeLists.txt b/clang/lib/Interpreter/CMakeLists.txt
--- a/clang/lib/Interpreter/CMakeLists.txt
+++ b/clang/lib/Interpreter/CMakeLists.txt
@@ -1,10 +1,8 @@
 set(LLVM_LINK_COMPONENTS
    core
-   native
    Option
    OrcJit
    Support
-   Target
   )
 
 add_clang_library(clangInterpreter
@@ -17,10 +15,8 @@
 
   LINK_LIBS
   clangAST
-  clangAnalysis
   clangBasic
   clangDriver
-  clangEdit
   clangFrontend
   clangLex
   clangParse
diff --git a/clang/lib/Serialization/CMakeLists.txt b/clang/lib/Serialization/CMakeLists.txt
--- a/clang/lib/Serialization/CMakeLists.txt
+++ b/clang/lib/Serialization/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(LLVM_LINK_COMPONENTS
-  BitReader
   BitstreamReader
   Support
   )
diff --git a/clang/lib/StaticAnalyzer/Core/CMakeLists.txt b/clang/lib/StaticAnalyzer/Core/CMakeLists.txt
--- a/clang/lib/StaticAnalyzer/Core/CMakeLists.txt
+++ b/clang/lib/StaticAnalyzer/Core/CMakeLists.txt
@@ -57,7 +57,6 @@
   clangAnalysis
   clangBasic
   clangCrossTU
-  clangFrontend
   clangLex
   clangRewrite
   clangToolingCore
diff --git a/clang/lib/StaticAnalyzer/Frontend/CMakeLists.txt b/clang/lib/StaticAnalyzer/Frontend/CMakeLists.txt
--- a/clang/lib/StaticAnalyzer/Frontend/CMakeLists.txt
+++ b/clang/lib/StaticAnalyzer/Frontend/CMakeLists.txt
@@ -15,7 +15,6 @@
 
   LINK_LIBS
   clangAST
-  clangASTMatchers
   clangAnalysis
   clangBasic
   clangCrossTU
diff --git a/clang/lib/Tooling/DependencyScanning/CMakeLists.txt b/clang/lib/Tooling/DependencyScanning/CMakeLists.txt
--- a/clang/lib/Tooling/DependencyScanning/CMakeLists.txt
+++ b/clang/lib/Tooling/DependencyScanning/CMakeLists.txt
@@ -1,6 +1,8 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  Core
+  AllTargetsAsmParsers
+  AllTargetsDescs
+  AllTargetsCodeGens
+  AllTargetsInfos
   Support
   )
 
@@ -15,14 +17,10 @@
   ClangDriverOptions
 
   LINK_LIBS
-  clangAST
   clangBasic
   clangCodeGen
-  clangDriver
   clangFrontend
-  clangFrontendTool
   clangLex
-  clangParse
   clangSerialization
   clangTooling
 )
diff --git a/clang/lib/Tooling/DumpTool/CMakeLists.txt b/clang/lib/Tooling/DumpTool/CMakeLists.txt
--- a/clang/lib/Tooling/DumpTool/CMakeLists.txt
+++ b/clang/lib/Tooling/DumpTool/CMakeLists.txt
@@ -12,5 +12,4 @@
   clangDriver
   clangFrontend
   clangSerialization
-  clangToolingCore
 )
diff --git a/clang/lib/Tooling/Inclusions/CMakeLists.txt b/clang/lib/Tooling/Inclusions/CMakeLists.txt
--- a/clang/lib/Tooling/Inclusions/CMakeLists.txt
+++ b/clang/lib/Tooling/Inclusions/CMakeLists.txt
@@ -9,6 +9,5 @@
   clangAST
   clangBasic
   clangLex
-  clangRewrite
   clangToolingCore
   )
diff --git a/clang/lib/Tooling/Refactoring/CMakeLists.txt b/clang/lib/Tooling/Refactoring/CMakeLists.txt
--- a/clang/lib/Tooling/Refactoring/CMakeLists.txt
+++ b/clang/lib/Tooling/Refactoring/CMakeLists.txt
@@ -16,7 +16,6 @@
 
   LINK_LIBS
   clangAST
-  clangASTMatchers
   clangBasic
   clangFormat
   clangIndex
diff --git a/clang/lib/Tooling/Syntax/CMakeLists.txt b/clang/lib/Tooling/Syntax/CMakeLists.txt
--- a/clang/lib/Tooling/Syntax/CMakeLists.txt
+++ b/clang/lib/Tooling/Syntax/CMakeLists.txt
@@ -12,7 +12,6 @@
   LINK_LIBS
   clangAST
   clangBasic
-  clangFrontend
   clangLex
   clangToolingCore
 
diff --git a/clang/lib/Tooling/Syntax/Pseudo/CMakeLists.txt b/clang/lib/Tooling/Syntax/Pseudo/CMakeLists.txt
--- a/clang/lib/Tooling/Syntax/Pseudo/CMakeLists.txt
+++ b/clang/lib/Tooling/Syntax/Pseudo/CMakeLists.txt
@@ -7,5 +7,4 @@
   
   LINK_LIBS
   clangBasic
-  clangLex
   )
diff --git a/clang/lib/Tooling/Transformer/CMakeLists.txt b/clang/lib/Tooling/Transformer/CMakeLists.txt
--- a/clang/lib/Tooling/Transformer/CMakeLists.txt
+++ b/clang/lib/Tooling/Transformer/CMakeLists.txt
@@ -17,7 +17,6 @@
   clangASTMatchers
   clangBasic
   clangLex
-  clangToolingCore
   clangToolingRefactoring
 
   DEPENDS
diff --git a/clang/tools/clang-check/CMakeLists.txt b/clang/tools/clang-check/CMakeLists.txt
--- a/clang/tools/clang-check/CMakeLists.txt
+++ b/clang/tools/clang-check/CMakeLists.txt
@@ -1,6 +1,5 @@
 set( LLVM_LINK_COMPONENTS
   ${LLVM_TARGETS_TO_BUILD}
-  Option
   Support
   )
 
diff --git a/clang/tools/clang-extdef-mapping/CMakeLists.txt b/clang/tools/clang-extdef-mapping/CMakeLists.txt
--- a/clang/tools/clang-extdef-mapping/CMakeLists.txt
+++ b/clang/tools/clang-extdef-mapping/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
   support
   )
 
diff --git a/clang/tools/clang-fuzzer/handle-cxx/CMakeLists.txt b/clang/tools/clang-fuzzer/handle-cxx/CMakeLists.txt
--- a/clang/tools/clang-fuzzer/handle-cxx/CMakeLists.txt
+++ b/clang/tools/clang-fuzzer/handle-cxx/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} Support)
+set(LLVM_LINK_COMPONENTS Support)
 
 add_clang_library(clangHandleCXX
   handle_cxx.cpp
@@ -7,7 +7,6 @@
   clangBasic
   clangCodeGen
   clangFrontend
-  clangLex
   clangSerialization
   clangTooling
   )
diff --git a/clang/tools/clang-fuzzer/handle-llvm/CMakeLists.txt b/clang/tools/clang-fuzzer/handle-llvm/CMakeLists.txt
--- a/clang/tools/clang-fuzzer/handle-llvm/CMakeLists.txt
+++ b/clang/tools/clang-fuzzer/handle-llvm/CMakeLists.txt
@@ -7,13 +7,8 @@
   IRReader
   MC
   MCJIT
-  Object
-  RuntimeDyld
-  SelectionDAG
   Support
   Target
-  TransformUtils
-  native
 )
 
 add_clang_library(clangHandleLLVM
diff --git a/clang/tools/clang-fuzzer/proto-to-cxx/CMakeLists.txt b/clang/tools/clang-fuzzer/proto-to-cxx/CMakeLists.txt
--- a/clang/tools/clang-fuzzer/proto-to-cxx/CMakeLists.txt
+++ b/clang/tools/clang-fuzzer/proto-to-cxx/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD})
 set(CMAKE_CXX_FLAGS ${CXX_FLAGS_NOFUZZ})
 
 # Needed by LLVM's CMake checks because this file defines multiple targets.
diff --git a/clang/tools/clang-fuzzer/proto-to-llvm/CMakeLists.txt b/clang/tools/clang-fuzzer/proto-to-llvm/CMakeLists.txt
--- a/clang/tools/clang-fuzzer/proto-to-llvm/CMakeLists.txt
+++ b/clang/tools/clang-fuzzer/proto-to-llvm/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD})
 set(CMAKE_CXX_FLAGS ${CXX_FLAGS_NOFUZZ})
 
 # Needed by LLVM's CMake checks because this file defines multiple targets.
diff --git a/clang/tools/clang-linker-wrapper/CMakeLists.txt b/clang/tools/clang-linker-wrapper/CMakeLists.txt
--- a/clang/tools/clang-linker-wrapper/CMakeLists.txt
+++ b/clang/tools/clang-linker-wrapper/CMakeLists.txt
@@ -4,7 +4,6 @@
   Core
   BinaryFormat
   MC
-  Target
   TransformUtils
   Analysis
   Passes
diff --git a/clang/tools/clang-nvlink-wrapper/CMakeLists.txt b/clang/tools/clang-nvlink-wrapper/CMakeLists.txt
--- a/clang/tools/clang-nvlink-wrapper/CMakeLists.txt
+++ b/clang/tools/clang-nvlink-wrapper/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LLVM_LINK_COMPONENTS BitWriter Core Object Support)
+set(LLVM_LINK_COMPONENTS Object Support)
 
 if(NOT CLANG_BUILT_STANDALONE)
   set(tablegen_deps intrinsics_gen)
diff --git a/clang/tools/clang-pseudo/CMakeLists.txt b/clang/tools/clang-pseudo/CMakeLists.txt
--- a/clang/tools/clang-pseudo/CMakeLists.txt
+++ b/clang/tools/clang-pseudo/CMakeLists.txt
@@ -4,12 +4,7 @@
   ClangPseudo.cpp
   )
 
-set(CLANG_PSEUDO_LIB_DEPS
-  clangBasic
-  clangToolingSyntaxPseudo
-  )
-
 clang_target_link_libraries(clang-pseudo
   PRIVATE
-  ${CLANG_PSEUDO_LIB_DEPS}
+  clangToolingSyntaxPseudo
   )
diff --git a/clang/tools/clang-refactor/CMakeLists.txt b/clang/tools/clang-refactor/CMakeLists.txt
--- a/clang/tools/clang-refactor/CMakeLists.txt
+++ b/clang/tools/clang-refactor/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(LLVM_LINK_COMPONENTS
-  Option
   Support
   )
 
@@ -15,9 +14,7 @@
   clangFormat
   clangFrontend
   clangLex
-  clangRewrite
   clangSerialization
   clangTooling
-  clangToolingCore
   clangToolingRefactoring
   )
diff --git a/clang/tools/clang-rename/CMakeLists.txt b/clang/tools/clang-rename/CMakeLists.txt
--- a/clang/tools/clang-rename/CMakeLists.txt
+++ b/clang/tools/clang-rename/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(LLVM_LINK_COMPONENTS
-  Option
   Support
   )
 
diff --git a/clang/tools/clang-repl/CMakeLists.txt b/clang/tools/clang-repl/CMakeLists.txt
--- a/clang/tools/clang-repl/CMakeLists.txt
+++ b/clang/tools/clang-repl/CMakeLists.txt
@@ -1,8 +1,7 @@
 set( LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  native
   Core
   LineEditor
-  Option
   OrcJIT
   Support
   )
@@ -15,7 +14,6 @@
   clangBasic
   clangFrontend
   clangInterpreter
-  clangTooling
   )
 
 # Support plugins.
diff --git a/clang/tools/clang-scan-deps/CMakeLists.txt b/clang/tools/clang-scan-deps/CMakeLists.txt
--- a/clang/tools/clang-scan-deps/CMakeLists.txt
+++ b/clang/tools/clang-scan-deps/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(LLVM_LINK_COMPONENTS
-  Core
   Support
   )
 
@@ -8,15 +7,8 @@
   )
 
 set(CLANG_SCAN_DEPS_LIB_DEPS
-  clangAST
   clangBasic
-  clangCodeGen
-  clangDriver
   clangFrontend
-  clangFrontendTool
-  clangLex
-  clangParse
-  clangSerialization
   clangTooling
   clangDependencyScanning
   )
diff --git a/clang/tools/driver/CMakeLists.txt b/clang/tools/driver/CMakeLists.txt
--- a/clang/tools/driver/CMakeLists.txt
+++ b/clang/tools/driver/CMakeLists.txt
@@ -1,5 +1,8 @@
 set( LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  AllTargetsAsmParsers
+  AllTargetsCodeGens
+  AllTargetsDescs
+  AllTargetsInfos
   Analysis
   CodeGen
   Core
diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt
--- a/clang/tools/libclang/CMakeLists.txt
+++ b/clang/tools/libclang/CMakeLists.txt
@@ -129,8 +129,10 @@
   ${LIBS}
 
   LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  Core
+  AllTargetsAsmParsers
+  AllTargetsCodeGens
+  AllTargetsDescs
+  AllTargetsInfos
   Support
   )
 
diff --git a/clang/unittests/CrossTU/CMakeLists.txt b/clang/unittests/CrossTU/CMakeLists.txt
--- a/clang/unittests/CrossTU/CMakeLists.txt
+++ b/clang/unittests/CrossTU/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
   Support
   )
 
diff --git a/clang/unittests/Index/CMakeLists.txt b/clang/unittests/Index/CMakeLists.txt
--- a/clang/unittests/Index/CMakeLists.txt
+++ b/clang/unittests/Index/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
   Support
   )
 
diff --git a/clang/unittests/Interpreter/CMakeLists.txt b/clang/unittests/Interpreter/CMakeLists.txt
--- a/clang/unittests/Interpreter/CMakeLists.txt
+++ b/clang/unittests/Interpreter/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  native
   Core
   )
 
diff --git a/clang/unittests/Interpreter/ExceptionTests/CMakeLists.txt b/clang/unittests/Interpreter/ExceptionTests/CMakeLists.txt
--- a/clang/unittests/Interpreter/ExceptionTests/CMakeLists.txt
+++ b/clang/unittests/Interpreter/ExceptionTests/CMakeLists.txt
@@ -4,7 +4,7 @@
 set(LLVM_REQUIRES_RTTI ON)
 
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  native
   Core
   OrcJIT
   Support
diff --git a/flang/tools/flang-driver/CMakeLists.txt b/flang/tools/flang-driver/CMakeLists.txt
--- a/flang/tools/flang-driver/CMakeLists.txt
+++ b/flang/tools/flang-driver/CMakeLists.txt
@@ -5,7 +5,6 @@
 link_directories(${LLVM_LIBRARY_DIR})
 
 set( LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
   Option
   Support
 )
diff --git a/lld/COFF/CMakeLists.txt b/lld/COFF/CMakeLists.txt
--- a/lld/COFF/CMakeLists.txt
+++ b/lld/COFF/CMakeLists.txt
@@ -23,9 +23,11 @@
   Writer.cpp
 
   LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  AllTargetsAsmParsers
+  AllTargetsCodeGens
+  AllTargetsDescs
+  AllTargetsInfos
   BinaryFormat
-  Core
   DebugInfoCodeView
   DebugInfoDWARF
   DebugInfoMSF
diff --git a/lld/Common/CMakeLists.txt b/lld/Common/CMakeLists.txt
--- a/lld/Common/CMakeLists.txt
+++ b/lld/Common/CMakeLists.txt
@@ -47,11 +47,8 @@
   Codegen
   Core
   DebugInfoDWARF
-  Demangle
-  MC
   Option
   Support
-  Target
 
   LINK_LIBS
   ${LLD_SYSTEM_LIBS}
diff --git a/lld/ELF/CMakeLists.txt b/lld/ELF/CMakeLists.txt
--- a/lld/ELF/CMakeLists.txt
+++ b/lld/ELF/CMakeLists.txt
@@ -47,10 +47,12 @@
   Writer.cpp
 
   LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  AllTargetsAsmParsers
+  AllTargetsCodeGens
+  AllTargetsDescs
+  AllTargetsInfos
   BinaryFormat
   BitWriter
-  Core
   DebugInfoDWARF
   Demangle
   LTO
diff --git a/lld/MachO/CMakeLists.txt b/lld/MachO/CMakeLists.txt
--- a/lld/MachO/CMakeLists.txt
+++ b/lld/MachO/CMakeLists.txt
@@ -34,10 +34,12 @@
   Writer.cpp
 
   LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  AllTargetsAsmParsers
+  AllTargetsCodeGens
+  AllTargetsDescs
+  AllTargetsInfos
   BinaryFormat
   BitReader
-  Core
   DebugInfoDWARF
   Demangle
   LTO
diff --git a/lld/wasm/CMakeLists.txt b/lld/wasm/CMakeLists.txt
--- a/lld/wasm/CMakeLists.txt
+++ b/lld/wasm/CMakeLists.txt
@@ -19,9 +19,11 @@
   WriterUtils.cpp
 
   LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  AllTargetsAsmParsers
+  AllTargetsCodeGens
+  AllTargetsDescs
+  AllTargetsInfos
   BinaryFormat
-  Core
   Demangle
   LTO
   MC
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt b/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt
--- a/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt
+++ b/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt
@@ -49,13 +49,11 @@
     clangLex
     clangParse
     clangRewrite
-    clangRewriteFrontend
     clangSema
     clangSerialization
   LINK_COMPONENTS
     Core
     ExecutionEngine
-    ipo
     MCJIT
     Support
   )
diff --git a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/CMakeLists.txt b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/CMakeLists.txt
--- a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/CMakeLists.txt
+++ b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/CMakeLists.txt
@@ -20,7 +20,5 @@
     clangBasic
   LINK_COMPONENTS
     Core
-    IRReader
     Support
-    Target
   )
diff --git a/lldb/unittests/Instruction/CMakeLists.txt b/lldb/unittests/Instruction/CMakeLists.txt
--- a/lldb/unittests/Instruction/CMakeLists.txt
+++ b/lldb/unittests/Instruction/CMakeLists.txt
@@ -1,12 +1,10 @@
-if("ARM" IN_LIST LLVM_TARGETS_TO_BUILD)
-  add_lldb_unittest(EmulatorTests
-    TestAArch64Emulator.cpp
-    LINK_LIBS
-      lldbCore
-      lldbSymbol
-      lldbTarget
-      lldbPluginInstructionARM64
-    LINK_COMPONENTS
-      Support
-      ${LLVM_TARGETS_TO_BUILD})
-endif()
+add_lldb_unittest(EmulatorTests
+  TestAArch64Emulator.cpp
+  LINK_LIBS
+    lldbCore
+    lldbSymbol
+    lldbTarget
+    lldbPluginInstructionARM64
+  LINK_COMPONENTS
+    Support
+  )
diff --git a/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt b/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt
--- a/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt
+++ b/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt
@@ -37,7 +37,6 @@
   Core
   DebugInfoCodeView
   DebugInfoDWARF
-  DebugInfoMSF
   MC
   MCParser
   Remarks
diff --git a/llvm/lib/CodeGen/MIRParser/CMakeLists.txt b/llvm/lib/CodeGen/MIRParser/CMakeLists.txt
--- a/llvm/lib/CodeGen/MIRParser/CMakeLists.txt
+++ b/llvm/lib/CodeGen/MIRParser/CMakeLists.txt
@@ -16,5 +16,4 @@
   Core
   MC
   Support
-  Target
   )
diff --git a/llvm/lib/DWARFLinker/CMakeLists.txt b/llvm/lib/DWARFLinker/CMakeLists.txt
--- a/llvm/lib/DWARFLinker/CMakeLists.txt
+++ b/llvm/lib/DWARFLinker/CMakeLists.txt
@@ -16,6 +16,5 @@
   AsmPrinter
   CodeGen
   MC
-  Object
   Support
   )
diff --git a/llvm/lib/DWP/CMakeLists.txt b/llvm/lib/DWP/CMakeLists.txt
--- a/llvm/lib/DWP/CMakeLists.txt
+++ b/llvm/lib/DWP/CMakeLists.txt
@@ -13,5 +13,4 @@
   MC
   Object
   Support
-  Target
 )
diff --git a/llvm/lib/Debuginfod/CMakeLists.txt b/llvm/lib/Debuginfod/CMakeLists.txt
--- a/llvm/lib/Debuginfod/CMakeLists.txt
+++ b/llvm/lib/Debuginfod/CMakeLists.txt
@@ -18,5 +18,4 @@
 
   LINK_COMPONENTS
   Support
-  Symbolize
   )
diff --git a/llvm/lib/ExecutionEngine/CMakeLists.txt b/llvm/lib/ExecutionEngine/CMakeLists.txt
--- a/llvm/lib/ExecutionEngine/CMakeLists.txt
+++ b/llvm/lib/ExecutionEngine/CMakeLists.txt
@@ -20,7 +20,6 @@
   OrcTargetProcess
   RuntimeDyld
   Support
-  Target
   )
 
 if(BUILD_SHARED_LIBS)
diff --git a/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt b/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt
--- a/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt
+++ b/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt
@@ -53,7 +53,6 @@
   OrcShared
   OrcTargetProcess
   MC
-  MCDisassembler
   Passes
   RuntimeDyld
   Support
diff --git a/llvm/lib/FuzzMutate/CMakeLists.txt b/llvm/lib/FuzzMutate/CMakeLists.txt
--- a/llvm/lib/FuzzMutate/CMakeLists.txt
+++ b/llvm/lib/FuzzMutate/CMakeLists.txt
@@ -18,5 +18,4 @@
   Core
   Scalar
   Support
-  Target
   )
diff --git a/llvm/lib/LTO/CMakeLists.txt b/llvm/lib/LTO/CMakeLists.txt
--- a/llvm/lib/LTO/CMakeLists.txt
+++ b/llvm/lib/LTO/CMakeLists.txt
@@ -14,24 +14,19 @@
   llvm_vcsrevision_h
 
   LINK_COMPONENTS
-  AggressiveInstCombine
   Analysis
   BinaryFormat
   BitReader
   BitWriter
-  CodeGen
   Core
   Extensions
   IPO
-  InstCombine
   Instrumentation
   Linker
   MC
   ObjCARC
   Object
   Passes
-  Remarks
-  Scalar
   Support
   Target
   TransformUtils
diff --git a/llvm/lib/MC/CMakeLists.txt b/llvm/lib/MC/CMakeLists.txt
--- a/llvm/lib/MC/CMakeLists.txt
+++ b/llvm/lib/MC/CMakeLists.txt
@@ -71,7 +71,6 @@
   LINK_COMPONENTS
   Support
   BinaryFormat
-  DebugInfoCodeView
   )
 
 add_subdirectory(MCParser)
diff --git a/llvm/lib/ProfileData/Coverage/CMakeLists.txt b/llvm/lib/ProfileData/Coverage/CMakeLists.txt
--- a/llvm/lib/ProfileData/Coverage/CMakeLists.txt
+++ b/llvm/lib/ProfileData/Coverage/CMakeLists.txt
@@ -10,7 +10,6 @@
   intrinsics_gen
 
   LINK_COMPONENTS
-  Core
   Object
   ProfileData
   Support
diff --git a/llvm/lib/Target/X86/MCA/CMakeLists.txt b/llvm/lib/Target/X86/MCA/CMakeLists.txt
--- a/llvm/lib/Target/X86/MCA/CMakeLists.txt
+++ b/llvm/lib/Target/X86/MCA/CMakeLists.txt
@@ -2,12 +2,8 @@
   X86CustomBehaviour.cpp
 
   LINK_COMPONENTS
-  MC
-  MCParser
-  X86Desc
   X86Info
   Support
-  MCA
 
   ADD_TO_COMPONENT
   X86
diff --git a/llvm/lib/TextAPI/CMakeLists.txt b/llvm/lib/TextAPI/CMakeLists.txt
--- a/llvm/lib/TextAPI/CMakeLists.txt
+++ b/llvm/lib/TextAPI/CMakeLists.txt
@@ -14,5 +14,4 @@
 
   LINK_COMPONENTS
   Support
-  BinaryFormat
 )
diff --git a/llvm/lib/Transforms/Scalar/CMakeLists.txt b/llvm/lib/Transforms/Scalar/CMakeLists.txt
--- a/llvm/lib/Transforms/Scalar/CMakeLists.txt
+++ b/llvm/lib/Transforms/Scalar/CMakeLists.txt
@@ -90,10 +90,8 @@
   Scalar
 
   LINK_COMPONENTS
-  AggressiveInstCombine
   Analysis
   Core
-  InstCombine
   Support
   TransformUtils
   )
diff --git a/llvm/lib/WindowsDriver/CMakeLists.txt b/llvm/lib/WindowsDriver/CMakeLists.txt
--- a/llvm/lib/WindowsDriver/CMakeLists.txt
+++ b/llvm/lib/WindowsDriver/CMakeLists.txt
@@ -8,6 +8,5 @@
   ${imported_libs}
 
   LINK_COMPONENTS
-  Option
   Support
   )
diff --git a/llvm/tools/dsymutil/CMakeLists.txt b/llvm/tools/dsymutil/CMakeLists.txt
--- a/llvm/tools/dsymutil/CMakeLists.txt
+++ b/llvm/tools/dsymutil/CMakeLists.txt
@@ -6,7 +6,6 @@
   AllTargetsCodeGens
   AllTargetsDescs
   AllTargetsInfos
-  AsmPrinter
   DebugInfoDWARF
   DWARFLinker
   MC
@@ -15,7 +14,6 @@
   Option
   Remarks
   Support
-  Target
   )
 
 add_llvm_tool(dsymutil
diff --git a/llvm/tools/llc/CMakeLists.txt b/llvm/tools/llc/CMakeLists.txt
--- a/llvm/tools/llc/CMakeLists.txt
+++ b/llvm/tools/llc/CMakeLists.txt
@@ -4,14 +4,12 @@
   AllTargetsDescs
   AllTargetsInfos
   Analysis
-  AsmParser
   AsmPrinter
   CodeGen
   Core
   IRReader
   MC
   MIRParser
-  Remarks
   ScalarOpts
   SelectionDAG
   Support
diff --git a/llvm/tools/lli/CMakeLists.txt b/llvm/tools/lli/CMakeLists.txt
--- a/llvm/tools/lli/CMakeLists.txt
+++ b/llvm/tools/lli/CMakeLists.txt
@@ -8,19 +8,14 @@
   ExecutionEngine
   IRReader
   Interpreter
-  JITLink
-  MC
   MCJIT
   Object
   OrcShared
   OrcJIT
   OrcTargetProcess
-  Passes
   RuntimeDyld
   SelectionDAG
   Support
-  Target
-  TransformUtils
   native
   )
 
diff --git a/llvm/tools/lli/ChildTarget/CMakeLists.txt b/llvm/tools/lli/ChildTarget/CMakeLists.txt
--- a/llvm/tools/lli/ChildTarget/CMakeLists.txt
+++ b/llvm/tools/lli/ChildTarget/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(LLVM_LINK_COMPONENTS
-  OrcJIT
   OrcShared
   OrcTargetProcess
   Support
diff --git a/llvm/tools/llvm-bcanalyzer/CMakeLists.txt b/llvm/tools/llvm-bcanalyzer/CMakeLists.txt
--- a/llvm/tools/llvm-bcanalyzer/CMakeLists.txt
+++ b/llvm/tools/llvm-bcanalyzer/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(LLVM_LINK_COMPONENTS
   BitReader
-  BitstreamReader
   Support
   )
 
diff --git a/llvm/tools/llvm-cfi-verify/CMakeLists.txt b/llvm/tools/llvm-cfi-verify/CMakeLists.txt
--- a/llvm/tools/llvm-cfi-verify/CMakeLists.txt
+++ b/llvm/tools/llvm-cfi-verify/CMakeLists.txt
@@ -4,8 +4,6 @@
   AllTargetsDisassemblers
   AllTargetsInfos
   MC
-  MCParser
-  Object
   Support
   Symbolize
   )
diff --git a/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt b/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt
--- a/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt
+++ b/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt
@@ -1,7 +1,6 @@
 set(LLVM_LINK_COMPONENTS
     DebugInfoDWARF
     MC
-    MCParser
     Object
     Support
     Symbolize
diff --git a/llvm/tools/llvm-cov/CMakeLists.txt b/llvm/tools/llvm-cov/CMakeLists.txt
--- a/llvm/tools/llvm-cov/CMakeLists.txt
+++ b/llvm/tools/llvm-cov/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LLVM_LINK_COMPONENTS core support object coverage profiledata)
+set(LLVM_LINK_COMPONENTS support object coverage profiledata)
 
 add_llvm_tool(llvm-cov
   llvm-cov.cpp
diff --git a/llvm/tools/llvm-cxxmap/CMakeLists.txt b/llvm/tools/llvm-cxxmap/CMakeLists.txt
--- a/llvm/tools/llvm-cxxmap/CMakeLists.txt
+++ b/llvm/tools/llvm-cxxmap/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(LLVM_LINK_COMPONENTS
-  Core
   Support
   )
 
diff --git a/llvm/tools/llvm-dlang-demangle-fuzzer/CMakeLists.txt b/llvm/tools/llvm-dlang-demangle-fuzzer/CMakeLists.txt
--- a/llvm/tools/llvm-dlang-demangle-fuzzer/CMakeLists.txt
+++ b/llvm/tools/llvm-dlang-demangle-fuzzer/CMakeLists.txt
@@ -1,7 +1,6 @@
 set(LLVM_LINK_COMPONENTS
   Demangle
   FuzzMutate
-  Support
 )
 
 add_llvm_fuzzer(llvm-dlang-demangle-fuzzer
diff --git a/llvm/tools/llvm-dwarfdump/CMakeLists.txt b/llvm/tools/llvm-dwarfdump/CMakeLists.txt
--- a/llvm/tools/llvm-dwarfdump/CMakeLists.txt
+++ b/llvm/tools/llvm-dwarfdump/CMakeLists.txt
@@ -2,7 +2,6 @@
   DebugInfoDWARF
   AllTargetsDescs
   AllTargetsInfos
-  MC
   Object
   Support
   )
diff --git a/llvm/tools/llvm-exegesis/CMakeLists.txt b/llvm/tools/llvm-exegesis/CMakeLists.txt
--- a/llvm/tools/llvm-exegesis/CMakeLists.txt
+++ b/llvm/tools/llvm-exegesis/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(LLVM_LINK_COMPONENTS
   MC
-  MCParser
   Support
   native
   )
diff --git a/llvm/tools/llvm-exegesis/lib/CMakeLists.txt b/llvm/tools/llvm-exegesis/lib/CMakeLists.txt
--- a/llvm/tools/llvm-exegesis/lib/CMakeLists.txt
+++ b/llvm/tools/llvm-exegesis/lib/CMakeLists.txt
@@ -26,7 +26,6 @@
   ExecutionEngine
   GlobalISel
   MC
-  MCDisassembler
   MCJIT
   MCParser
   Object
diff --git a/llvm/tools/llvm-exegesis/lib/X86/CMakeLists.txt b/llvm/tools/llvm-exegesis/lib/X86/CMakeLists.txt
--- a/llvm/tools/llvm-exegesis/lib/X86/CMakeLists.txt
+++ b/llvm/tools/llvm-exegesis/lib/X86/CMakeLists.txt
@@ -4,7 +4,7 @@
   )
 
 set(LLVM_LINK_COMPONENTS
-  X86
+  X86CodeGen
   Exegesis
   Core
   Support
diff --git a/llvm/tools/llvm-gsymutil/CMakeLists.txt b/llvm/tools/llvm-gsymutil/CMakeLists.txt
--- a/llvm/tools/llvm-gsymutil/CMakeLists.txt
+++ b/llvm/tools/llvm-gsymutil/CMakeLists.txt
@@ -5,7 +5,6 @@
   MC
   Object
   Support
-  Target
   )
 
 add_llvm_tool(llvm-gsymutil
diff --git a/llvm/tools/llvm-ifs/CMakeLists.txt b/llvm/tools/llvm-ifs/CMakeLists.txt
--- a/llvm/tools/llvm-ifs/CMakeLists.txt
+++ b/llvm/tools/llvm-ifs/CMakeLists.txt
@@ -1,10 +1,8 @@
 set(LLVM_LINK_COMPONENTS
   BinaryFormat
   InterfaceStub  
-  Object
   Support
   TextAPI
-  ObjectYAML
   )
 
 add_llvm_tool(llvm-ifs
diff --git a/llvm/tools/llvm-isel-fuzzer/CMakeLists.txt b/llvm/tools/llvm-isel-fuzzer/CMakeLists.txt
--- a/llvm/tools/llvm-isel-fuzzer/CMakeLists.txt
+++ b/llvm/tools/llvm-isel-fuzzer/CMakeLists.txt
@@ -4,18 +4,11 @@
     AllTargetsDescs
     AllTargetsInfos
     Analysis
-    AsmPrinter
-    BitReader
-    BitWriter
     CodeGen
     Core
     FuzzMutate
-    IRReader
     MC
-    ScalarOpts
-    SelectionDAG
     Support
-    Target
 )
 add_llvm_fuzzer(llvm-isel-fuzzer
   llvm-isel-fuzzer.cpp
diff --git a/llvm/tools/llvm-itanium-demangle-fuzzer/CMakeLists.txt b/llvm/tools/llvm-itanium-demangle-fuzzer/CMakeLists.txt
--- a/llvm/tools/llvm-itanium-demangle-fuzzer/CMakeLists.txt
+++ b/llvm/tools/llvm-itanium-demangle-fuzzer/CMakeLists.txt
@@ -1,7 +1,6 @@
 set(LLVM_LINK_COMPONENTS
   Demangle
   FuzzMutate
-  Support
 )
 
 add_llvm_fuzzer(llvm-itanium-demangle-fuzzer
diff --git a/llvm/tools/llvm-jitlink/CMakeLists.txt b/llvm/tools/llvm-jitlink/CMakeLists.txt
--- a/llvm/tools/llvm-jitlink/CMakeLists.txt
+++ b/llvm/tools/llvm-jitlink/CMakeLists.txt
@@ -7,7 +7,6 @@
   AllTargetsDisassemblers
   AllTargetsInfos
   BinaryFormat
-  ExecutionEngine
   JITLink
   MC
   Object
diff --git a/llvm/tools/llvm-lipo/CMakeLists.txt b/llvm/tools/llvm-lipo/CMakeLists.txt
--- a/llvm/tools/llvm-lipo/CMakeLists.txt
+++ b/llvm/tools/llvm-lipo/CMakeLists.txt
@@ -1,11 +1,9 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
   Object
   Option
   Support
   TextAPI
   Core
-  BinaryFormat
 )
 
 set(LLVM_TARGET_DEFINITIONS LipoOpts.td)
diff --git a/llvm/tools/llvm-lto/CMakeLists.txt b/llvm/tools/llvm-lto/CMakeLists.txt
--- a/llvm/tools/llvm-lto/CMakeLists.txt
+++ b/llvm/tools/llvm-lto/CMakeLists.txt
@@ -7,13 +7,10 @@
   BitWriter
   CodeGen
   Core
-  IRReader
   IPO
   LTO
   MC
-  Object
   Support
-  Target
   )
 
 add_llvm_tool(llvm-lto
diff --git a/llvm/tools/llvm-lto2/CMakeLists.txt b/llvm/tools/llvm-lto2/CMakeLists.txt
--- a/llvm/tools/llvm-lto2/CMakeLists.txt
+++ b/llvm/tools/llvm-lto2/CMakeLists.txt
@@ -6,13 +6,10 @@
   BitReader
   CodeGen
   Core
-  Linker
   LTO
   MC
-  Object
   Passes
   Support
-  Target
   )
 
 add_llvm_tool(llvm-lto2
diff --git a/llvm/tools/llvm-mca/CMakeLists.txt b/llvm/tools/llvm-mca/CMakeLists.txt
--- a/llvm/tools/llvm-mca/CMakeLists.txt
+++ b/llvm/tools/llvm-mca/CMakeLists.txt
@@ -4,7 +4,6 @@
   AllTargetsAsmParsers
   AllTargetsMCAs          # CustomBehaviour and InstrPostProcess
   AllTargetsDescs
-  AllTargetsDisassemblers
   AllTargetsInfos
   MCA
   MC
diff --git a/llvm/tools/llvm-microsoft-demangle-fuzzer/CMakeLists.txt b/llvm/tools/llvm-microsoft-demangle-fuzzer/CMakeLists.txt
--- a/llvm/tools/llvm-microsoft-demangle-fuzzer/CMakeLists.txt
+++ b/llvm/tools/llvm-microsoft-demangle-fuzzer/CMakeLists.txt
@@ -1,7 +1,6 @@
 set(LLVM_LINK_COMPONENTS
   Demangle
   FuzzMutate
-  Support
 )
 
 add_llvm_fuzzer(llvm-microsoft-demangle-fuzzer
diff --git a/llvm/tools/llvm-modextract/CMakeLists.txt b/llvm/tools/llvm-modextract/CMakeLists.txt
--- a/llvm/tools/llvm-modextract/CMakeLists.txt
+++ b/llvm/tools/llvm-modextract/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(LLVM_LINK_COMPONENTS
-  IRReader
   BitReader
   BitWriter
   Core
diff --git a/llvm/tools/llvm-nm/CMakeLists.txt b/llvm/tools/llvm-nm/CMakeLists.txt
--- a/llvm/tools/llvm-nm/CMakeLists.txt
+++ b/llvm/tools/llvm-nm/CMakeLists.txt
@@ -2,7 +2,6 @@
   AllTargetsAsmParsers
   AllTargetsDescs
   AllTargetsInfos
-  BinaryFormat
   Core
   Demangle
   Object
diff --git a/llvm/tools/llvm-objcopy/CMakeLists.txt b/llvm/tools/llvm-objcopy/CMakeLists.txt
--- a/llvm/tools/llvm-objcopy/CMakeLists.txt
+++ b/llvm/tools/llvm-objcopy/CMakeLists.txt
@@ -3,8 +3,6 @@
   ObjCopy
   Option
   Support
-  MC
-  BinaryFormat
   )
 
 set(LLVM_TARGET_DEFINITIONS ObjcopyOpts.td)
diff --git a/llvm/tools/llvm-objdump/CMakeLists.txt b/llvm/tools/llvm-objdump/CMakeLists.txt
--- a/llvm/tools/llvm-objdump/CMakeLists.txt
+++ b/llvm/tools/llvm-objdump/CMakeLists.txt
@@ -4,7 +4,6 @@
   AllTargetsInfos
   BinaryFormat
   DebugInfoDWARF
-  DebugInfoPDB
   Demangle
   MC
   MCDisassembler
diff --git a/llvm/tools/llvm-opt-fuzzer/CMakeLists.txt b/llvm/tools/llvm-opt-fuzzer/CMakeLists.txt
--- a/llvm/tools/llvm-opt-fuzzer/CMakeLists.txt
+++ b/llvm/tools/llvm-opt-fuzzer/CMakeLists.txt
@@ -4,13 +4,11 @@
   AllTargetsDescs
   AllTargetsInfos
   Analysis
-  BitReader
   BitWriter
   CodeGen
   Core
   Coroutines
   IPO
-  IRReader
   AggressiveInstCombine
   InstCombine
   Instrumentation
diff --git a/llvm/tools/llvm-opt-report/CMakeLists.txt b/llvm/tools/llvm-opt-report/CMakeLists.txt
--- a/llvm/tools/llvm-opt-report/CMakeLists.txt
+++ b/llvm/tools/llvm-opt-report/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LLVM_LINK_COMPONENTS Core Demangle Object Remarks Support)
+set(LLVM_LINK_COMPONENTS Demangle Remarks Support)
 
 add_llvm_tool(llvm-opt-report
   OptReport.cpp
diff --git a/llvm/tools/llvm-profdata/CMakeLists.txt b/llvm/tools/llvm-profdata/CMakeLists.txt
--- a/llvm/tools/llvm-profdata/CMakeLists.txt
+++ b/llvm/tools/llvm-profdata/CMakeLists.txt
@@ -1,8 +1,6 @@
 set(LLVM_LINK_COMPONENTS
   Core
   ProfileData
-  Object
-  DebugInfoDWARF
   Support
   )
 
diff --git a/llvm/tools/llvm-readobj/CMakeLists.txt b/llvm/tools/llvm-readobj/CMakeLists.txt
--- a/llvm/tools/llvm-readobj/CMakeLists.txt
+++ b/llvm/tools/llvm-readobj/CMakeLists.txt
@@ -6,9 +6,6 @@
   BinaryFormat
   Option
   Support
-  DebugInfoCodeView
-  DebugInfoMSF
-  DebugInfoPDB
   )
 
 set(LLVM_TARGET_DEFINITIONS Opts.td)
diff --git a/llvm/tools/llvm-reduce/CMakeLists.txt b/llvm/tools/llvm-reduce/CMakeLists.txt
--- a/llvm/tools/llvm-reduce/CMakeLists.txt
+++ b/llvm/tools/llvm-reduce/CMakeLists.txt
@@ -11,7 +11,6 @@
   MC
   MIRParser
   Support
-  Target
   TransformUtils
   )
 
diff --git a/llvm/tools/llvm-remark-size-diff/CMakeLists.txt b/llvm/tools/llvm-remark-size-diff/CMakeLists.txt
--- a/llvm/tools/llvm-remark-size-diff/CMakeLists.txt
+++ b/llvm/tools/llvm-remark-size-diff/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LLVM_LINK_COMPONENTS Core Demangle Object Remarks Support)
+set(LLVM_LINK_COMPONENTS Remarks Support)
 
 add_llvm_tool(llvm-remark-size-diff
   RemarkSizeDiff.cpp
diff --git a/llvm/tools/llvm-rtdyld/CMakeLists.txt b/llvm/tools/llvm-rtdyld/CMakeLists.txt
--- a/llvm/tools/llvm-rtdyld/CMakeLists.txt
+++ b/llvm/tools/llvm-rtdyld/CMakeLists.txt
@@ -3,7 +3,6 @@
   AllTargetsDescs
   AllTargetsInfos
   DebugInfoDWARF
-  ExecutionEngine
   MC
   Object
   RuntimeDyld
diff --git a/llvm/tools/llvm-rust-demangle-fuzzer/CMakeLists.txt b/llvm/tools/llvm-rust-demangle-fuzzer/CMakeLists.txt
--- a/llvm/tools/llvm-rust-demangle-fuzzer/CMakeLists.txt
+++ b/llvm/tools/llvm-rust-demangle-fuzzer/CMakeLists.txt
@@ -1,7 +1,6 @@
 set(LLVM_LINK_COMPONENTS
   Demangle
   FuzzMutate
-  Support
 )
 
 add_llvm_fuzzer(llvm-rust-demangle-fuzzer
diff --git a/llvm/tools/llvm-stress/CMakeLists.txt b/llvm/tools/llvm-stress/CMakeLists.txt
--- a/llvm/tools/llvm-stress/CMakeLists.txt
+++ b/llvm/tools/llvm-stress/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(LLVM_LINK_COMPONENTS
-  Analysis
   Core
   Support
   )
diff --git a/llvm/tools/llvm-strings/CMakeLists.txt b/llvm/tools/llvm-strings/CMakeLists.txt
--- a/llvm/tools/llvm-strings/CMakeLists.txt
+++ b/llvm/tools/llvm-strings/CMakeLists.txt
@@ -1,6 +1,4 @@
 set(LLVM_LINK_COMPONENTS
-  Core
-  Object
   Option
   Support
   )
diff --git a/llvm/tools/llvm-symbolizer/CMakeLists.txt b/llvm/tools/llvm-symbolizer/CMakeLists.txt
--- a/llvm/tools/llvm-symbolizer/CMakeLists.txt
+++ b/llvm/tools/llvm-symbolizer/CMakeLists.txt
@@ -8,10 +8,6 @@
 add_public_tablegen_target(SymbolizerOptsTableGen)
 
 set(LLVM_LINK_COMPONENTS
-  DebugInfoDWARF
-  DebugInfoPDB
-  Demangle
-  Object
   Option
   Support
   Symbolize
diff --git a/llvm/tools/llvm-tli-checker/CMakeLists.txt b/llvm/tools/llvm-tli-checker/CMakeLists.txt
--- a/llvm/tools/llvm-tli-checker/CMakeLists.txt
+++ b/llvm/tools/llvm-tli-checker/CMakeLists.txt
@@ -1,17 +1,10 @@
 set(LLVM_LINK_COMPONENTS
   Analysis
-  BinaryFormat
-  BitReader
-  BitstreamReader
   Core
   Demangle
-  MC
-  MCParser
   Object
   Option
-  Remarks
   Support
-  TextAPI
   )
 
 set(LLVM_TARGET_DEFINITIONS Opts.td)
diff --git a/llvm/tools/llvm-xray/CMakeLists.txt b/llvm/tools/llvm-xray/CMakeLists.txt
--- a/llvm/tools/llvm-xray/CMakeLists.txt
+++ b/llvm/tools/llvm-xray/CMakeLists.txt
@@ -1,6 +1,4 @@
 set(LLVM_LINK_COMPONENTS
-  DebugInfoDWARF
-  Object
   Support
   Symbolize
   XRay
diff --git a/llvm/tools/lto/CMakeLists.txt b/llvm/tools/lto/CMakeLists.txt
--- a/llvm/tools/lto/CMakeLists.txt
+++ b/llvm/tools/lto/CMakeLists.txt
@@ -9,9 +9,7 @@
   CodeGen
   LTO
   MC
-  MCDisassembler
   Support
-  Target
   )
 
 set(SOURCES
diff --git a/llvm/tools/opt/CMakeLists.txt b/llvm/tools/opt/CMakeLists.txt
--- a/llvm/tools/opt/CMakeLists.txt
+++ b/llvm/tools/opt/CMakeLists.txt
@@ -7,7 +7,6 @@
   Analysis
   AsmParser
   BitWriter
-  CFGuard
   CodeGen
   Core
   Coroutines
@@ -18,7 +17,6 @@
   Instrumentation
   MC
   ObjCARCOpts
-  Remarks
   ScalarOpts
   Support
   Target
diff --git a/llvm/tools/sancov/CMakeLists.txt b/llvm/tools/sancov/CMakeLists.txt
--- a/llvm/tools/sancov/CMakeLists.txt
+++ b/llvm/tools/sancov/CMakeLists.txt
@@ -2,10 +2,7 @@
   AllTargetsDescs
   AllTargetsDisassemblers
   AllTargetsInfos
-  DebugInfoDWARF
-  DebugInfoPDB
   MC
-  MCDisassembler
   Object
   Support
   Symbolize
diff --git a/llvm/unittests/ExecutionEngine/JITLink/CMakeLists.txt b/llvm/unittests/ExecutionEngine/JITLink/CMakeLists.txt
--- a/llvm/unittests/ExecutionEngine/JITLink/CMakeLists.txt
+++ b/llvm/unittests/ExecutionEngine/JITLink/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
   JITLink
   Object
   OrcShared
diff --git a/llvm/unittests/MC/CMakeLists.txt b/llvm/unittests/MC/CMakeLists.txt
--- a/llvm/unittests/MC/CMakeLists.txt
+++ b/llvm/unittests/MC/CMakeLists.txt
@@ -1,17 +1,20 @@
-foreach(t ${LLVM_TARGETS_TO_BUILD})
-  if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${t})
-    add_subdirectory(${t})
-  endif()
-endforeach()
-
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  AllTargetsDescs
+  AllTargetsDisassemblers
+  AllTargetsInfos
   MC
   MCDisassembler
   Object
   Support
   )
 
+foreach(t ${LLVM_TARGETS_TO_BUILD})
+  if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${t})
+    add_subdirectory(${t})
+    list(APPEND LLVM_LINK_COMPONENTS ${t})
+  endif()
+endforeach()
+
 add_llvm_unittest(MCTests
   Disassembler.cpp
   DwarfLineTables.cpp
diff --git a/mlir/lib/Analysis/CMakeLists.txt b/mlir/lib/Analysis/CMakeLists.txt
--- a/mlir/lib/Analysis/CMakeLists.txt
+++ b/mlir/lib/Analysis/CMakeLists.txt
@@ -31,7 +31,6 @@
   MLIRCallInterfaces
   MLIRControlFlowInterfaces
   MLIRDataLayoutInterfaces
-  MLIRInferTypeOpInterface
   MLIRSideEffectInterfaces
   MLIRViewLikeInterface
   )
diff --git a/mlir/lib/Dialect/Affine/Analysis/CMakeLists.txt b/mlir/lib/Dialect/Affine/Analysis/CMakeLists.txt
--- a/mlir/lib/Dialect/Affine/Analysis/CMakeLists.txt
+++ b/mlir/lib/Dialect/Affine/Analysis/CMakeLists.txt
@@ -14,9 +14,6 @@
   LINK_LIBS PUBLIC
   MLIRAffine
   MLIRAnalysis
-  MLIRCallInterfaces
-  MLIRControlFlowInterfaces
-  MLIRInferTypeOpInterface
   MLIRPresburger
   MLIRSCF
   )
diff --git a/mlir/lib/Dialect/Affine/IR/CMakeLists.txt b/mlir/lib/Dialect/Affine/IR/CMakeLists.txt
--- a/mlir/lib/Dialect/Affine/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Affine/IR/CMakeLists.txt
@@ -13,7 +13,6 @@
   LINK_LIBS PUBLIC
   MLIRArithmetic
   MLIRIR
-  MLIRLoopLikeInterface
   MLIRMemRef
   MLIRSideEffectInterfaces
   MLIRTensor
diff --git a/mlir/lib/Dialect/Arithmetic/IR/CMakeLists.txt b/mlir/lib/Dialect/Arithmetic/IR/CMakeLists.txt
--- a/mlir/lib/Dialect/Arithmetic/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Arithmetic/IR/CMakeLists.txt
@@ -13,7 +13,6 @@
   MLIRArithmeticOpsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRDialect
   MLIRInferTypeOpInterface
   MLIRIR
   )
diff --git a/mlir/lib/Dialect/Arithmetic/Utils/CMakeLists.txt b/mlir/lib/Dialect/Arithmetic/Utils/CMakeLists.txt
--- a/mlir/lib/Dialect/Arithmetic/Utils/CMakeLists.txt
+++ b/mlir/lib/Dialect/Arithmetic/Utils/CMakeLists.txt
@@ -6,6 +6,5 @@
 
   LINK_LIBS PUBLIC
   MLIRArithmetic
-  MLIRDialect
   MLIRIR
   )
diff --git a/mlir/lib/Dialect/Async/IR/CMakeLists.txt b/mlir/lib/Dialect/Async/IR/CMakeLists.txt
--- a/mlir/lib/Dialect/Async/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Async/IR/CMakeLists.txt
@@ -8,7 +8,6 @@
   MLIRAsyncOpsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRDialect
   MLIRInferTypeOpInterface
   MLIRIR
   )
diff --git a/mlir/lib/Dialect/Bufferization/IR/CMakeLists.txt b/mlir/lib/Dialect/Bufferization/IR/CMakeLists.txt
--- a/mlir/lib/Dialect/Bufferization/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Bufferization/IR/CMakeLists.txt
@@ -12,8 +12,8 @@
   MLIRBufferizationOpsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRDialect
   MLIRIR
   MLIRTensor
   MLIRMemRef
+  MLIRMemRefUtils
   )
diff --git a/mlir/lib/Dialect/GPU/CMakeLists.txt b/mlir/lib/Dialect/GPU/CMakeLists.txt
--- a/mlir/lib/Dialect/GPU/CMakeLists.txt
+++ b/mlir/lib/Dialect/GPU/CMakeLists.txt
@@ -36,7 +36,6 @@
   MLIRDLTI
   MLIRIR
   MLIRMemRef
-  MLIRSideEffectInterfaces
   MLIRSupport
   )
 
diff --git a/mlir/lib/Dialect/MemRef/IR/CMakeLists.txt b/mlir/lib/Dialect/MemRef/IR/CMakeLists.txt
--- a/mlir/lib/Dialect/MemRef/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/MemRef/IR/CMakeLists.txt
@@ -9,17 +9,13 @@
   MLIRStandardOpsIncGen
   MLIRMemRefOpsIncGen
 
-  LINK_COMPONENTS
-  Core
-
   LINK_LIBS PUBLIC
   MLIRArithmetic
   MLIRArithmeticUtils
   MLIRControlFlowInterfaces
-  MLIRDialect
   MLIRDialectUtils
   MLIRInferTypeOpInterface
   MLIRIR
-  MLIRMemRefUtils
+  MLIRSideEffectInterfaces
   MLIRViewLikeInterface
 )
diff --git a/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt
--- a/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt
@@ -19,7 +19,6 @@
   LINK_LIBS PUBLIC
   MLIRAffine
   MLIRAffineAnalysis
-  MLIRAffineUtils
   MLIRArithmetic
   MLIRBufferization
   MLIRBufferizationTransforms
@@ -28,7 +27,6 @@
   MLIRLinalg
   MLIRMemRef
   MLIRSCF
-  MLIRTransforms
   MLIRVector
   MLIRVectorInterfaces
   MLIRVectorUtils
diff --git a/mlir/lib/Transforms/CMakeLists.txt b/mlir/lib/Transforms/CMakeLists.txt
--- a/mlir/lib/Transforms/CMakeLists.txt
+++ b/mlir/lib/Transforms/CMakeLists.txt
@@ -22,7 +22,6 @@
 
   LINK_LIBS PUBLIC
   MLIRAnalysis
-  MLIRCopyOpInterface
   MLIRLoopLikeInterface
   MLIRPass
   MLIRSupport
diff --git a/polly/lib/CMakeLists.txt b/polly/lib/CMakeLists.txt
--- a/polly/lib/CMakeLists.txt
+++ b/polly/lib/CMakeLists.txt
@@ -29,18 +29,8 @@
     TransformUtils
     Analysis
     ipo
-    MC
     Passes
-    Linker
-    IRReader
     Analysis
-    # The libraries below are required for darwin: http://PR26392
-    BitReader
-    MCParser
-    Object
-    ProfileData
-    Target
-    Vectorize
 )
 
 # Polly-ACC requires the NVPTX backend to work. Ask LLVM about its libraries.