Index: tools/ast-query/Makefile
===================================================================
--- tools/ast-query/Makefile	(revision 158064)
+++ tools/ast-query/Makefile	(working copy)
@@ -16,7 +16,7 @@
 TOOL_NO_EXPORTS = 1
 
 LINK_COMPONENTS := support mc
-USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
+USEDLIBS = clangEdit.a clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
            clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
            clangAST.a clangASTMatchers.a clangDynamicASTMatchers.a \
            clangLex.a clangBasic.a
Index: tools/remove-cstr-calls/CMakeLists.txt
===================================================================
--- tools/remove-cstr-calls/CMakeLists.txt	(revision 158064)
+++ tools/remove-cstr-calls/CMakeLists.txt	(working copy)
@@ -1,4 +1,4 @@
-set(LLVM_USED_LIBS clangTooling clangBasic clangAST)
+set(LLVM_USED_LIBS clangEdit clangTooling clangBasic clangAST)
 
 add_clang_executable(remove-cstr-calls
   RemoveCStrCalls.cpp
Index: tools/remove-cstr-calls/Makefile
===================================================================
--- tools/remove-cstr-calls/Makefile	(revision 158064)
+++ tools/remove-cstr-calls/Makefile	(working copy)
@@ -16,7 +16,7 @@
 TOOL_NO_EXPORTS = 1
 
 LINK_COMPONENTS := support mc
-USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
+USEDLIBS = clangEdit.a clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
            clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
 					 clangAST.a clangASTMatchers.a clangLex.a clangBasic.a
 
Index: tools/rename/Makefile
===================================================================
--- tools/rename/Makefile	(revision 158064)
+++ tools/rename/Makefile	(working copy)
@@ -16,7 +16,7 @@
 TOOL_NO_EXPORTS = 1
 
 LINK_COMPONENTS := support mc
-USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
+USEDLIBS = clangEdit.a clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
            clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
            clangAST.a clangASTMatchers.a clangLex.a clangBasic.a
 
Index: unittests/ASTMatchers/Dynamic/Makefile
===================================================================
--- unittests/ASTMatchers/Dynamic/Makefile	(revision 158064)
+++ unittests/ASTMatchers/Dynamic/Makefile	(working copy)
@@ -10,7 +10,7 @@
 CLANG_LEVEL = ../../..
 TESTNAME = DynamicASTMatchers
 LINK_COMPONENTS := support mc
-USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
+USEDLIBS = clangEdit.a clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
            clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
            clangAST.a clangASTMatchers.a clangLex.a clangBasic.a \
            clangDynamicASTMatchers.a
Index: unittests/ASTMatchers/Makefile
===================================================================
--- unittests/ASTMatchers/Makefile	(revision 158064)
+++ unittests/ASTMatchers/Makefile	(working copy)
@@ -12,7 +12,7 @@
 
 TESTNAME = ASTMatchers
 LINK_COMPONENTS := support mc
-USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
+USEDLIBS = clangEdit.a clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
            clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
 					 clangAST.a clangASTMatchers.a clangLex.a clangBasic.a