diff --git a/lib/ExecutionEngine/CMakeLists.txt b/lib/ExecutionEngine/CMakeLists.txt
index 22203da90f7..49a597acb37 100644
--- a/lib/ExecutionEngine/CMakeLists.txt
+++ b/lib/ExecutionEngine/CMakeLists.txt
@@ -22,10 +22,6 @@ add_llvm_component_library(LLVMExecutionEngine
   Target
   )
 
-if(BUILD_SHARED_LIBS)
-  target_link_libraries(LLVMExecutionEngine PUBLIC LLVMRuntimeDyld)
-endif()
-
 add_subdirectory(Interpreter)
 add_subdirectory(JITLink)
 add_subdirectory(MCJIT)
diff --git a/lib/ExecutionEngine/JITLink/CMakeLists.txt b/lib/ExecutionEngine/JITLink/CMakeLists.txt
index 512e3523a1e..d8088b4fe5a 100644
--- a/lib/ExecutionEngine/JITLink/CMakeLists.txt
+++ b/lib/ExecutionEngine/JITLink/CMakeLists.txt
@@ -24,10 +24,3 @@ add_llvm_component_library(LLVMJITLink
   OrcTargetProcess
   Support
   )
- 
-target_link_libraries(LLVMJITLink
-  PRIVATE
-  LLVMObject
-  LLVMOrcTargetProcess
-  LLVMSupport
-)
diff --git a/lib/ExecutionEngine/Orc/CMakeLists.txt b/lib/ExecutionEngine/Orc/CMakeLists.txt
index 791b037323f..cba92a24ebc 100644
--- a/lib/ExecutionEngine/Orc/CMakeLists.txt
+++ b/lib/ExecutionEngine/Orc/CMakeLists.txt
@@ -32,6 +32,9 @@ add_llvm_component_library(LLVMOrcJIT
   intrinsics_gen
 
   LINK_COMPONENTS
+  Analysis
+  BitReader
+  BitWriter
   Core
   ExecutionEngine
   JITLink
@@ -48,11 +51,3 @@ add_llvm_component_library(LLVMOrcJIT
 
 add_subdirectory(Shared)
 add_subdirectory(TargetProcess)
-
-target_link_libraries(LLVMOrcJIT
-  PRIVATE
-  LLVMAnalysis
-  LLVMBitReader
-  LLVMBitWriter
-  LLVMPasses
-  )
diff --git a/lib/FileCheck/CMakeLists.txt b/lib/FileCheck/CMakeLists.txt
index 91c80e1482f..1e3456279ea 100644
--- a/lib/FileCheck/CMakeLists.txt
+++ b/lib/FileCheck/CMakeLists.txt
@@ -3,6 +3,7 @@ add_llvm_component_library(LLVMFileCheck
 
   ADDITIONAL_HEADER_DIRS
   "${LLVM_MAIN_INCLUDE_DIR}/llvm/FileCheck"
-)
 
-target_link_libraries(LLVMFileCheck LLVMSupport)
+  LINK_COMPONENTS
+  Support
+)
diff --git a/lib/Frontend/OpenACC/CMakeLists.txt b/lib/Frontend/OpenACC/CMakeLists.txt
index ba340ab9c56..3667f46e8e3 100644
--- a/lib/Frontend/OpenACC/CMakeLists.txt
+++ b/lib/Frontend/OpenACC/CMakeLists.txt
@@ -12,7 +12,7 @@ add_llvm_component_library(LLVMFrontendOpenACC
   DEPENDS
   acc_gen
   acc_cpp
+
+  LINK_COMPONENTS
+  Support
 )
-
-target_link_libraries(LLVMFrontendOpenACC LLVMSupport)
-