diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5317244..dbd4b34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,12 +81,6 @@ include_directories(${CMAKE_BINARY_DIR})
 include_directories(${CLANG_INCLUDE_DIRS} ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}/src)
 link_directories("${LLVM_INSTALL_PREFIX}/lib" ${LLVM_LIBRARY_DIRS})
 
-if (${LLVM_VERSION} VERSION_GREATER_EQUAL "9.0.0")
-    set(clang_tooling_refactoring_lib clangToolingRefactoring)
-else()
-    set(clang_tooling_refactoring_lib clangToolingRefactor)
-endif()
-
 macro(link_to_llvm name is_standalone)
   foreach(clang_lib ${CLANG_LIBS})
     if(MSVC)
@@ -128,9 +122,6 @@ macro(link_to_llvm name is_standalone)
   if(CLANG_CLANG-CPP_LIB)
     target_link_libraries(${name} clang-cpp)
   else()
-    target_link_libraries(${name} clangTooling)
-    target_link_libraries(${name} clangToolingCore)
-    target_link_libraries(${name} ${clang_tooling_refactoring_lib})
   endif()
   if (CLAZY_USES_BOOST_REGEX)
     target_link_libraries(${name} ${Boost_LIBRARIES})
@@ -259,30 +250,7 @@ else()
     ${CLAZY_PLUGIN_SRCS}
 
     LINK_LIBS
-    clangToolingCore
-    clangToolingInclusions
-    ${clang_tooling_refactoring_lib}
-    clangFrontend
-    clangDriver
-    clangCodeGen
-    clangSema
-    clangAnalysis
-    clangRewriteFrontend
-    clangRewrite
-    clangAST
-    clangASTMatchers
-    clangParse
-    clangLex
-    clangBasic
-    clangARCMigrate
-    clangEdit
-    clangFrontendTool
-    clangRewrite
-    clangSerialization
-    clangTooling
-    clangStaticAnalyzerCheckers
-    clangStaticAnalyzerCore
-    clangStaticAnalyzerFrontend
+    clang-cpp
     )
   add_executable(clazy-standalone ${CLAZY_STANDALONE_SRCS})
 
diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
index 50e0829..0edf402 100644
--- a/cmake/FindClang.cmake
+++ b/cmake/FindClang.cmake
@@ -63,30 +63,6 @@ if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
   find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
 
   FIND_AND_ADD_CLANG_LIB(clang-cpp)
-  FIND_AND_ADD_CLANG_LIB(clangFrontend)
-  FIND_AND_ADD_CLANG_LIB(clangDriver)
-  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
-  FIND_AND_ADD_CLANG_LIB(clangSema)
-  FIND_AND_ADD_CLANG_LIB(clangChecker)
-  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
-  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
-  FIND_AND_ADD_CLANG_LIB(clangAST)
-  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
-  FIND_AND_ADD_CLANG_LIB(clangParse)
-  FIND_AND_ADD_CLANG_LIB(clangLex)
-  FIND_AND_ADD_CLANG_LIB(clangBasic)
-  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
-  FIND_AND_ADD_CLANG_LIB(clangEdit)
-  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
-  FIND_AND_ADD_CLANG_LIB(clangSerialization)
-  FIND_AND_ADD_CLANG_LIB(clangTooling)
-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
-  FIND_AND_ADD_CLANG_LIB(clangSema)
-  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
 endif()
 
 if(CLANG_LIBS OR CLANG_LIBCLANG_LIB)