Index: change-namespace/tool/CMakeLists.txt
===================================================================
--- change-namespace/tool/CMakeLists.txt
+++ change-namespace/tool/CMakeLists.txt
@@ -8,6 +8,7 @@
   ClangChangeNamespace.cpp
   )
 target_link_libraries(clang-change-namespace
+  PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
Index: clang-apply-replacements/tool/CMakeLists.txt
===================================================================
--- clang-apply-replacements/tool/CMakeLists.txt
+++ clang-apply-replacements/tool/CMakeLists.txt
@@ -6,6 +6,7 @@
   ClangApplyReplacementsMain.cpp
   )
 target_link_libraries(clang-apply-replacements
+  PRIVATE
   clangApplyReplacements
   clangBasic
   clangFormat
Index: clang-move/tool/CMakeLists.txt
===================================================================
--- clang-move/tool/CMakeLists.txt
+++ clang-move/tool/CMakeLists.txt
@@ -5,6 +5,7 @@
   )
 
 target_link_libraries(clang-move
+  PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
Index: clang-query/tool/CMakeLists.txt
===================================================================
--- clang-query/tool/CMakeLists.txt
+++ clang-query/tool/CMakeLists.txt
@@ -2,6 +2,7 @@
 
 add_clang_executable(clang-query ClangQuery.cpp)
 target_link_libraries(clang-query
+  PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
Index: clang-reorder-fields/tool/CMakeLists.txt
===================================================================
--- clang-reorder-fields/tool/CMakeLists.txt
+++ clang-reorder-fields/tool/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_clang_tool(clang-reorder-fields ClangReorderFields.cpp)
 
 target_link_libraries(clang-reorder-fields
+  PRIVATE
   clangBasic
   clangFrontend
   clangReorderFields
Index: clang-tidy/tool/CMakeLists.txt
===================================================================
--- clang-tidy/tool/CMakeLists.txt
+++ clang-tidy/tool/CMakeLists.txt
@@ -12,6 +12,7 @@
   clang-headers
   )
 target_link_libraries(clang-tidy
+  PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
Index: clangd/tool/CMakeLists.txt
===================================================================
--- clangd/tool/CMakeLists.txt
+++ clangd/tool/CMakeLists.txt
@@ -9,6 +9,7 @@
   )
 
 target_link_libraries(clangd
+  PRIVATE
   clangBasic
   clangDaemon
   clangFormat
Index: include-fixer/find-all-symbols/tool/CMakeLists.txt
===================================================================
--- include-fixer/find-all-symbols/tool/CMakeLists.txt
+++ include-fixer/find-all-symbols/tool/CMakeLists.txt
@@ -5,6 +5,7 @@
   )
 
 target_link_libraries(find-all-symbols
+  PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
Index: include-fixer/tool/CMakeLists.txt
===================================================================
--- include-fixer/tool/CMakeLists.txt
+++ include-fixer/tool/CMakeLists.txt
@@ -5,6 +5,7 @@
   )
 
 target_link_libraries(clang-include-fixer
+  PRIVATE
   clangBasic
   clangFormat
   clangFrontend
Index: modularize/CMakeLists.txt
===================================================================
--- modularize/CMakeLists.txt
+++ modularize/CMakeLists.txt
@@ -12,6 +12,7 @@
   )
 
 target_link_libraries(modularize
+  PRIVATE
   clangAST
   clangBasic
   clangDriver
Index: pp-trace/CMakeLists.txt
===================================================================
--- pp-trace/CMakeLists.txt
+++ pp-trace/CMakeLists.txt
@@ -8,6 +8,7 @@
   )
 
 target_link_libraries(pp-trace
+  PRIVATE
   clangAST
   clangBasic
   clangFrontend
Index: tool-template/CMakeLists.txt
===================================================================
--- tool-template/CMakeLists.txt
+++ tool-template/CMakeLists.txt
@@ -7,6 +7,7 @@
   )
 
 target_link_libraries(tool-template
+  PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
Index: unittests/change-namespace/CMakeLists.txt
===================================================================
--- unittests/change-namespace/CMakeLists.txt
+++ unittests/change-namespace/CMakeLists.txt
@@ -16,6 +16,7 @@
   )
 
 target_link_libraries(ChangeNamespaceTests
+  PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
Index: unittests/clang-apply-replacements/CMakeLists.txt
===================================================================
--- unittests/clang-apply-replacements/CMakeLists.txt
+++ unittests/clang-apply-replacements/CMakeLists.txt
@@ -13,6 +13,7 @@
   )
 
 target_link_libraries(ClangApplyReplacementsTests
+  PRIVATE
   clangApplyReplacements
   clangBasic
   clangToolingCore
Index: unittests/clang-move/CMakeLists.txt
===================================================================
--- unittests/clang-move/CMakeLists.txt
+++ unittests/clang-move/CMakeLists.txt
@@ -16,6 +16,7 @@
   )
 
 target_link_libraries(ClangMoveTests
+  PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
Index: unittests/clang-query/CMakeLists.txt
===================================================================
--- unittests/clang-query/CMakeLists.txt
+++ unittests/clang-query/CMakeLists.txt
@@ -12,6 +12,7 @@
   )
 
 target_link_libraries(ClangQueryTests
+  PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
Index: unittests/clang-tidy/CMakeLists.txt
===================================================================
--- unittests/clang-tidy/CMakeLists.txt
+++ unittests/clang-tidy/CMakeLists.txt
@@ -19,6 +19,7 @@
   ReadabilityModuleTest.cpp)
 
 target_link_libraries(ClangTidyTests
+  PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
Index: unittests/clangd/CMakeLists.txt
===================================================================
--- unittests/clangd/CMakeLists.txt
+++ unittests/clangd/CMakeLists.txt
@@ -18,6 +18,7 @@
   )
 
 target_link_libraries(ClangdTests
+  PRIVATE
   clangBasic
   clangDaemon
   clangFormat
Index: unittests/include-fixer/CMakeLists.txt
===================================================================
--- unittests/include-fixer/CMakeLists.txt
+++ unittests/include-fixer/CMakeLists.txt
@@ -17,6 +17,7 @@
   )
 
 target_link_libraries(IncludeFixerTests
+  PRIVATE
   clangBasic
   clangFormat
   clangFrontend
Index: unittests/include-fixer/find-all-symbols/CMakeLists.txt
===================================================================
--- unittests/include-fixer/find-all-symbols/CMakeLists.txt
+++ unittests/include-fixer/find-all-symbols/CMakeLists.txt
@@ -13,6 +13,7 @@
   )
 
 target_link_libraries(FindAllSymbolsTests
+  PRIVATE
   clangAST
   clangASTMatchers
   clangBasic