diff --git a/lib/ARCMigrate/CMakeLists.txt b/lib/ARCMigrate/CMakeLists.txt
index 004e5cd681d7661439a312522a59e89d0cb03813..b4b5d865d85c7c61cd1a135894bdfb1af8421d01 100644
--- a/lib/ARCMigrate/CMakeLists.txt
+++ b/lib/ARCMigrate/CMakeLists.txt
@@ -44,9 +44,7 @@ target_link_libraries(clangARCMigrate
   clangEdit
   clangFrontend
   clangLex
-  clangParse
   clangRewriteCore
-  clangRewriteFrontend
   clangSema
   clangSerialization
   clangStaticAnalyzerCheckers
diff --git a/lib/ASTMatchers/CMakeLists.txt b/lib/ASTMatchers/CMakeLists.txt
index 4a390a8fc3dea068b14b08a518dc18656dc1e85d..82a5e6d3a9bf60ac4267e135fe20fb659cf8d3ef 100644
--- a/lib/ASTMatchers/CMakeLists.txt
+++ b/lib/ASTMatchers/CMakeLists.txt
@@ -18,6 +18,5 @@ add_dependencies(clangASTMatchers
   )
 
 target_link_libraries(clangASTMatchers
-  clangBasic
   clangAST
   )
diff --git a/lib/CodeGen/CMakeLists.txt b/lib/CodeGen/CMakeLists.txt
index 26c2ca3f599b992c0f069c1ef05b0ef829f43d45..c78d17b6a0f036a296309958d86a5beddb6d8d03 100644
--- a/lib/CodeGen/CMakeLists.txt
+++ b/lib/CodeGen/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(LLVM_LINK_COMPONENTS
-  AsmParser
   BitReader
   BitWriter
   Core
@@ -14,7 +13,6 @@ set(LLVM_LINK_COMPONENTS
   Support
   Target
   TransformUtils
-  Vectorize
   )
 
 add_clang_library(clangCodeGen
diff --git a/lib/Format/CMakeLists.txt b/lib/Format/CMakeLists.txt
index 58e01e66d51902525c05b65fe06e69e48152d506..eb24386171912fadad893ceed72b30ce51d6704f 100644
--- a/lib/Format/CMakeLists.txt
+++ b/lib/Format/CMakeLists.txt
@@ -20,12 +20,7 @@ add_dependencies(clangFormat
   )
 
 target_link_libraries(clangFormat
-  clangAST
-  clangASTMatchers
   clangBasic
-  clangFrontend
   clangLex
-  clangRewriteCore
-  clangRewriteFrontend
   clangTooling
   )
diff --git a/lib/FrontendTool/CMakeLists.txt b/lib/FrontendTool/CMakeLists.txt
index 64f7e8b092eb8ce537a397713d7799553a48e8ad..c818d6f3e67ef5abc59b17f8c3e2538e6f76e87e 100644
--- a/lib/FrontendTool/CMakeLists.txt
+++ b/lib/FrontendTool/CMakeLists.txt
@@ -18,7 +18,6 @@ target_link_libraries(clangFrontendTool
   clangCodeGen
   clangDriver
   clangFrontend
-  clangRewriteCore
   clangRewriteFrontend
   )
 
@@ -31,7 +30,5 @@ endif()
 if(CLANG_ENABLE_STATIC_ANALYZER)
   target_link_libraries(clangFrontendTool
     clangStaticAnalyzerFrontend
-    clangStaticAnalyzerCheckers
-    clangStaticAnalyzerCore
     )
 endif()
diff --git a/lib/Rewrite/Core/CMakeLists.txt b/lib/Rewrite/Core/CMakeLists.txt
index c7f5d61838ca0274665a6e7418eee5b9f5e3cee4..0c17862d6407fdde86f91020754624f40c46246a 100644
--- a/lib/Rewrite/Core/CMakeLists.txt
+++ b/lib/Rewrite/Core/CMakeLists.txt
@@ -25,5 +25,4 @@ target_link_libraries(clangRewriteCore
   clangAST
   clangBasic
   clangLex
-  clangParse
   )
diff --git a/lib/Rewrite/Frontend/CMakeLists.txt b/lib/Rewrite/Frontend/CMakeLists.txt
index 5c817b5c3a9a8f780524a4e53121a5e0bbb51127..a354ebfec3e9f942790b57b5dcaed2eafec82961 100644
--- a/lib/Rewrite/Frontend/CMakeLists.txt
+++ b/lib/Rewrite/Frontend/CMakeLists.txt
@@ -30,6 +30,5 @@ target_link_libraries(clangRewriteFrontend
   clangEdit
   clangFrontend
   clangLex
-  clangParse
   clangRewriteCore
   )
diff --git a/lib/StaticAnalyzer/Core/CMakeLists.txt b/lib/StaticAnalyzer/Core/CMakeLists.txt
index 2fccd6d75a6db7507783f74811668f1d6df6190a..c3e037ceeec7d8bc10475147996edd99997c35c1 100644
--- a/lib/StaticAnalyzer/Core/CMakeLists.txt
+++ b/lib/StaticAnalyzer/Core/CMakeLists.txt
@@ -54,7 +54,6 @@ target_link_libraries(clangStaticAnalyzerCore
   clangAST
   clangAnalysis
   clangBasic
-  clangFrontend
   clangLex
   clangRewriteCore
   )
diff --git a/lib/StaticAnalyzer/Frontend/CMakeLists.txt b/lib/StaticAnalyzer/Frontend/CMakeLists.txt
index b3f72fbce834b039c96a4ffbe9dae04cac7c4b9a..ec5a39dcfe44f7c28b1a0087d20654272651a5b4 100644
--- a/lib/StaticAnalyzer/Frontend/CMakeLists.txt
+++ b/lib/StaticAnalyzer/Frontend/CMakeLists.txt
@@ -29,9 +29,6 @@ target_link_libraries(clangStaticAnalyzerFrontend
   clangAnalysis
   clangBasic
   clangFrontend
-  clangLex
-  clangRewriteCore
-  clangRewriteFrontend
   clangStaticAnalyzerCheckers
   clangStaticAnalyzerCore
   )
diff --git a/lib/Tooling/CMakeLists.txt b/lib/Tooling/CMakeLists.txt
index 4b233b90bcaf6729e219ed6fb5e0ed44eb84cec4..3cce49d0ca5ce18f3bddb39c252bbfad044fe372 100644
--- a/lib/Tooling/CMakeLists.txt
+++ b/lib/Tooling/CMakeLists.txt
@@ -28,5 +28,4 @@ target_link_libraries(clangTooling
   clangFrontend
   clangLex
   clangRewriteCore
-  clangRewriteFrontend
   )