diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt
index ae52cab..04b9293 100644
--- a/addon/doxyapp/CMakeLists.txt
+++ b/addon/doxyapp/CMakeLists.txt
@@ -14,7 +14,7 @@ doxyapp.cpp
 )
 
 if (use_libclang)
-    set(CLANG_LIBS libclang clangTooling ${llvm_libs})
+    set(CLANG_LIBS libclang clang-cpp ${llvm_libs})
 endif()
 
 target_link_libraries(doxyapp
diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt
index 2387f1b..c880c3d 100644
--- a/addon/doxyparse/CMakeLists.txt
+++ b/addon/doxyparse/CMakeLists.txt
@@ -14,7 +14,7 @@ doxyparse.cpp
 )
 
 if (use_libclang)
-    set(CLANG_LIBS libclang clangTooling ${llvm_libs})
+    set(CLANG_LIBS libclang clang-cpp ${llvm_libs})
 endif()
 
 target_link_libraries(doxyparse
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3f4767c..d6891a6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -310,9 +310,9 @@ if (use_libclang)
     endif()
     include_directories(${LLVM_INCLUDE_DIRS})
     add_definitions(${LLVM_DEFINITIONS})
-    llvm_map_components_to_libnames(llvm_libs support core option)
+    llvm_map_components_to_libnames(llvm_libs support)
     target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS})
-    set(CLANG_LIBS libclang clangTooling clangBasic clangLex ${llvm_libs})
+    set(CLANG_LIBS libclang clang-cpp ${llvm_libs})
 endif()
 
 target_link_libraries(doxygen