diff --git a/lldb/source/Commands/CMakeLists.txt b/lldb/source/Commands/CMakeLists.txt
index 33332f2d59a23..69e4c45f0b8e5 100644
--- a/lldb/source/Commands/CMakeLists.txt
+++ b/lldb/source/Commands/CMakeLists.txt
@@ -58,8 +58,6 @@ add_lldb_library(lldbCommands NO_PLUGIN_DEPENDENCIES
     lldbUtility
     lldbValueObject
     lldbVersion
-  CLANG_LIBS
-    clangFrontend
   )
 
 add_dependencies(lldbCommands LLDBOptionsGen)
diff --git a/lldb/source/ValueObject/CMakeLists.txt b/lldb/source/ValueObject/CMakeLists.txt
index f0fe7f374a506..2a61407521bec 100644
--- a/lldb/source/ValueObject/CMakeLists.txt
+++ b/lldb/source/ValueObject/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_lldb_library(lldbValueObject NO_PLUGIN_DEPENDENCIES
+add_lldb_library(lldbValueObject
   DILAST.cpp
   DILEval.cpp
   DILLexer.cpp
@@ -34,4 +34,6 @@ add_lldb_library(lldbValueObject NO_PLUGIN_DEPENDENCIES
     lldbSymbol
     lldbTarget
     lldbUtility
+    lldbPluginCPlusPlusLanguage
+    lldbPluginObjCLanguage
   )