diff --git a/clang-tools-extra/clang-include-fixer/plugin/CMakeLists.txt b/clang-tools-extra/clang-include-fixer/plugin/CMakeLists.txt
index 6d0328ed831..d531e44743a 100644
--- a/clang-tools-extra/clang-include-fixer/plugin/CMakeLists.txt
+++ b/clang-tools-extra/clang-include-fixer/plugin/CMakeLists.txt
@@ -2,16 +2,19 @@ add_clang_library(clangIncludeFixerPlugin
   IncludeFixerPlugin.cpp
 
   LINK_LIBS
+  clangIncludeFixer
+  ${LLVM_PTHREAD_LIB}
+
+  DEPENDS
+  omp_gen
+  ClangDriverOptions
+  )
+clang_target_link_libraries(clangIncludeFixerPlugin
+  PRIVATE
   clangAST
   clangBasic
   clangFrontend
-  clangIncludeFixer
   clangParse
   clangSema
   clangTooling
-  ${LLVM_PTHREAD_LIB}
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
   )
diff --git a/clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt b/clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt
index 8f708cacfdf..b08e9cee954 100644
--- a/clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt
+++ b/clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt
@@ -32,18 +32,21 @@ add_clang_library(clangDaemonTweaks OBJECT
   SwapIfBranches.cpp
 
   LINK_LIBS
-  clangAST
-  clangBasic
   clangDaemon
   clangdSupport
+
+  DEPENDS
+  omp_gen
+  ClangDriverOptions
+  )
+
+clang_target_link_libraries(clangDaemonTweaks INTERFACE
+  clangAST
+  clangBasic
   clangFormat
   clangLex
   clangSema
   clangToolingCore
   clangToolingRefactoring
   clangToolingSyntax
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
   )