7 files changed, 10 insertions, 9 deletions
diff --git a/clang/include/clang/ASTMatchers/RefactoringCallbacks.h b/clang/include/clang/Tooling/RefactoringCallbacks.h
index 5d9c99ff2c7..762e57e27b8 100644
--- a/clang/include/clang/ASTMatchers/RefactoringCallbacks.h
+++ b/clang/include/clang/Tooling/RefactoringCallbacks.h
@@ -26,8 +26,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_AST_MATCHERS_REFACTORING_CALLBACKS_H
-#define LLVM_CLANG_AST_MATCHERS_REFACTORING_CALLBACKS_H
+#ifndef LLVM_CLANG_TOOLING_REFACTORING_CALLBACKS_H
+#define LLVM_CLANG_TOOLING_REFACTORING_CALLBACKS_H
 
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/Tooling/Refactoring.h"
@@ -87,4 +87,4 @@ private:
 } // end namespace ast_matchers
 } // end namespace clang
 
-#endif // LLVM_CLANG_AST_MATCHERS_REFACTORING_CALLBACKS_H
+#endif // LLVM_CLANG_TOOLING_REFACTORING_CALLBACKS_H
diff --git a/clang/lib/ASTMatchers/CMakeLists.txt b/clang/lib/ASTMatchers/CMakeLists.txt
index ac7988d86f8..8fc7d4b208e 100644
--- a/clang/lib/ASTMatchers/CMakeLists.txt
+++ b/clang/lib/ASTMatchers/CMakeLists.txt
@@ -4,7 +4,6 @@ set(LLVM_USED_LIBS clangBasic clangAST)
 add_clang_library(clangASTMatchers
   ASTMatchFinder.cpp
   ASTMatchersInternal.cpp
-  RefactoringCallbacks.cpp
   )
 
 add_dependencies(clangASTMatchers
diff --git a/clang/lib/Tooling/CMakeLists.txt b/clang/lib/Tooling/CMakeLists.txt
index c96691b6251..bec266cc7b2 100644
--- a/clang/lib/Tooling/CMakeLists.txt
+++ b/clang/lib/Tooling/CMakeLists.txt
@@ -6,6 +6,7 @@ add_clang_library(clangTooling
   Refactoring.cpp
   Tooling.cpp
   ArgumentsAdjusters.cpp
+  RefactoringCallbacks.cpp
   )
 
 add_dependencies(clangTooling
@@ -16,5 +17,6 @@ target_link_libraries(clangTooling
   clangBasic
   clangFrontend
   clangAST
+  clangASTMatchers
   clangRewrite
   )
diff --git a/clang/lib/ASTMatchers/RefactoringCallbacks.cpp b/clang/lib/Tooling/RefactoringCallbacks.cpp
index e747cd7bdc0..2584747d6df 100644
--- a/clang/lib/ASTMatchers/RefactoringCallbacks.cpp
+++ b/clang/lib/Tooling/RefactoringCallbacks.cpp
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 #include "clang/Lex/Lexer.h"
-#include "clang/ASTMatchers/RefactoringCallbacks.h"
+#include "clang/Tooling/RefactoringCallbacks.h"
 
 namespace clang {
 namespace ast_matchers {
diff --git a/clang/unittests/ASTMatchers/CMakeLists.txt b/clang/unittests/ASTMatchers/CMakeLists.txt
index 9e026347786..8e617321419 100644
--- a/clang/unittests/ASTMatchers/CMakeLists.txt
+++ b/clang/unittests/ASTMatchers/CMakeLists.txt
@@ -1,6 +1,5 @@
 add_clang_unittest(ASTMatchersTests
-  ASTMatchersTest.cpp
-  RefactoringCallbacksTest.cpp)
+  ASTMatchersTest.cpp)
 
 target_link_libraries(ASTMatchersTests
   gtest gtest_main clangASTMatchers clangTooling)
diff --git a/clang/unittests/Tooling/CMakeLists.txt b/clang/unittests/Tooling/CMakeLists.txt
index 59050492fab..3b5aaf858b2 100644
--- a/clang/unittests/Tooling/CMakeLists.txt
+++ b/clang/unittests/Tooling/CMakeLists.txt
@@ -5,6 +5,7 @@ add_clang_unittest(ToolingTests
   RecursiveASTVisitorTest.cpp
   RefactoringTest.cpp
   RewriterTest.cpp
+  RefactoringCallbacksTest.cpp
   )
 
 target_link_libraries(ToolingTests
diff --git a/clang/unittests/ASTMatchers/RefactoringCallbacksTest.cpp b/clang/unittests/Tooling/RefactoringCallbacksTest.cpp
index bb9f504a037..90d9377ccd6 100644
--- a/clang/unittests/ASTMatchers/RefactoringCallbacksTest.cpp
+++ b/clang/unittests/Tooling/RefactoringCallbacksTest.cpp
@@ -9,9 +9,9 @@
 
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/ASTMatchers/RefactoringCallbacks.h"
-#include "../Tooling/RewriterTestContext.h"
+#include "clang/Tooling/RefactoringCallbacks.h"
 #include "gtest/gtest.h"
+#include "RewriterTestContext.h"
 
 namespace clang {
 namespace ast_matchers {