diff --git a/examples/PrintFunctionNames/CMakeLists.txt b/examples/PrintFunctionNames/CMakeLists.txt
index fa46b54701a9eb4bde61008af6320d90c4d0a790..49dd22ad8d0d65f15a76abab73baba375c59da41 100644
--- a/examples/PrintFunctionNames/CMakeLists.txt
+++ b/examples/PrintFunctionNames/CMakeLists.txt
@@ -3,11 +3,20 @@ set(SHARED_LIBRARY TRUE)
 set(LLVM_NO_RTTI 1)
 
 set(LLVM_USED_LIBS
-  clangFrontend clangIndex clangSema clangAnalysis clangAST clangParse clangLex clangBasic)
+  clangIndex
+  clangFrontend
+  clangDriver
+  clangSema
+  clangAnalysis
+  clangAST
+  clangParse
+  clangLex
+  clangBasic)
 
 set( LLVM_LINK_COMPONENTS
-  MC
-  support
+  bitreader
+  mc
+  core
   )
 
 add_clang_library(PrintFunctionNames PrintFunctionNames.cpp)
diff --git a/examples/PrintFunctionNames/Makefile b/examples/PrintFunctionNames/Makefile
index 881b7cfa337a9479756ed2e40e56a2e1dcd9b0af..3c0c1f82ad8af4837281d3ea5086852d7c74b62f 100644
--- a/examples/PrintFunctionNames/Makefile
+++ b/examples/PrintFunctionNames/Makefile
@@ -21,7 +21,8 @@ include $(LEVEL)/Makefile.config
 LINK_LIBS_IN_SHARED = 1
 SHARED_LIBRARY = 1
 
-LINK_COMPONENTS := MC support
-USEDLIBS = clangFrontend.a clangIndex.a clangSema.a clangAnalysis.a clangAST.a clangParse.a clangLex.a clangBasic.a
+LINK_COMPONENTS := bitreader mc core
+USEDLIBS = clangIndex.a clangFrontend.a clangDriver.a clangSema.a \
+	   clangAnalysis.a clangAST.a clangParse.a clangLex.a clangBasic.a
 
 include $(LEVEL)/Makefile.common
diff --git a/examples/wpa/CMakeLists.txt b/examples/wpa/CMakeLists.txt
index 5553474b4bcd502f93f2ae88d843e8c7ea42f2bb..b3d49cbef34f4922011edc9fb794185e63ca00f4 100644
--- a/examples/wpa/CMakeLists.txt
+++ b/examples/wpa/CMakeLists.txt
@@ -1,13 +1,20 @@
 set(LLVM_NO_RTTI 1)
 
-set( LLVM_USED_LIBS
+set(LLVM_USED_LIBS
+  clangIndex
   clangFrontend
-  clangAnalysis
+  clangDriver
   clangSema
+  clangAnalysis
   clangAST
+  clangParse
   clangLex
-  clangBasic
-  clangIndex
+  clangBasic)
+
+set( LLVM_LINK_COMPONENTS
+  bitreader
+  mc
+  core
   )
 
 set( LLVM_LINK_COMPONENTS
diff --git a/examples/wpa/Makefile b/examples/wpa/Makefile
index 01dbd11b8df55d9d0128ff9ab70efcb4cc8e6b7a..54b61d08571a7fa0bd3f7e840ac54d516e40565c 100644
--- a/examples/wpa/Makefile
+++ b/examples/wpa/Makefile
@@ -10,7 +10,8 @@ TOOL_NO_EXPORTS = 1
 
 include $(LEVEL)/Makefile.config
 
-LINK_COMPONENTS := bitreader mc
-USEDLIBS = clangFrontend.a clangSema.a clangAST.a clangLex.a clangBasic.a clangAnalysis.a clangIndex.a
+LINK_COMPONENTS := bitreader mc core
+USEDLIBS = clangIndex.a clangFrontend.a clangDriver.a clangSema.a \
+	   clangAnalysis.a clangAST.a clangParse.a clangLex.a clangBasic.a
 
 include $(LLVM_SRC_ROOT)/Makefile.rules