diff --git a/clang/lib/CodeGen/CMakeLists.txt b/clang/lib/CodeGen/CMakeLists.txt
index 13dd16d93d7a..7c7403f239c8 100644
--- a/clang/lib/CodeGen/CMakeLists.txt
+++ b/clang/lib/CodeGen/CMakeLists.txt
@@ -22,7 +22,6 @@ set(LLVM_LINK_COMPONENTS
   Object
   Passes
   ProfileData
-  Remarks
   ScalarOpts
   Support
   Target
diff --git a/clang/lib/Tooling/DependencyScanning/CMakeLists.txt b/clang/lib/Tooling/DependencyScanning/CMakeLists.txt
index a8ff0a2813bc..bc807e162c91 100644
--- a/clang/lib/Tooling/DependencyScanning/CMakeLists.txt
+++ b/clang/lib/Tooling/DependencyScanning/CMakeLists.txt
@@ -23,7 +23,6 @@ add_clang_library(clangDependencyScanning
   clangDriver
   clangFrontend
   clangLex
-  clangParse
   clangSerialization
   clangTooling
   )
diff --git a/clang/tools/clang-scan-deps/CMakeLists.txt b/clang/tools/clang-scan-deps/CMakeLists.txt
index a0aa95ddf2a8..f0be6a546ff8 100644
--- a/clang/tools/clang-scan-deps/CMakeLists.txt
+++ b/clang/tools/clang-scan-deps/CMakeLists.txt
@@ -24,7 +24,6 @@ set(CLANG_SCAN_DEPS_LIB_DEPS
   clangDriver
   clangFrontend
   clangLex
-  clangParse
   clangSerialization
   clangTooling
   )
diff --git a/clang/unittests/CodeGen/CMakeLists.txt b/clang/unittests/CodeGen/CMakeLists.txt
index add13bd4f7bd..a437f441568f 100644
--- a/clang/unittests/CodeGen/CMakeLists.txt
+++ b/clang/unittests/CodeGen/CMakeLists.txt
@@ -17,7 +17,6 @@ clang_target_link_libraries(ClangCodeGenTests
   clangBasic
   clangCodeGen
   clangFrontend
-  clangInterpreter
   clangLex
   clangParse
   clangSerialization
diff --git a/clang/unittests/DirectoryWatcher/CMakeLists.txt b/clang/unittests/DirectoryWatcher/CMakeLists.txt
index 0f95dc823753..38882c9ec216 100644
--- a/clang/unittests/DirectoryWatcher/CMakeLists.txt
+++ b/clang/unittests/DirectoryWatcher/CMakeLists.txt
@@ -11,7 +11,6 @@ if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME STREQUAL Wind
   target_link_libraries(DirectoryWatcherTests
     PRIVATE
     LLVMTestingSupport
-    clangBasic
     clangDirectoryWatcher
     )
 
diff --git a/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt b/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt
index 1055e316cc73..c15c2eac0d04 100644
--- a/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt
+++ b/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt
@@ -68,7 +68,6 @@ add_llvm_component_library(LLVMOrcJIT
   OrcTargetProcess
   WindowsDriver
   MC
-  MCDisassembler
   Passes
   RuntimeDyld
   Support
diff --git a/llvm/tools/llvm-ar/CMakeLists.txt b/llvm/tools/llvm-ar/CMakeLists.txt
index 19e3fadb8133..4d0718f8cefe 100644
--- a/llvm/tools/llvm-ar/CMakeLists.txt
+++ b/llvm/tools/llvm-ar/CMakeLists.txt
@@ -9,7 +9,6 @@ set(LLVM_LINK_COMPONENTS
   Object
   Support
   TargetParser
-  TextAPI
   )
 
 add_llvm_tool(llvm-ar
diff --git a/llvm/tools/llvm-stress/CMakeLists.txt b/llvm/tools/llvm-stress/CMakeLists.txt
index e4d1ae65ee76..9073555b19ad 100644
--- 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/unittests/MC/X86/CMakeLists.txt b/llvm/unittests/MC/X86/CMakeLists.txt
index 1ac1b2e37706..1bd6efd663ca 100644
--- a/llvm/unittests/MC/X86/CMakeLists.txt
+++ b/llvm/unittests/MC/X86/CMakeLists.txt
@@ -1,7 +1,6 @@
 set(LLVM_LINK_COMPONENTS
   MC
   MCDisassembler
-  Target
   TargetParser
   X86Desc
   X86Disassembler