diff --git a/clang-tools-extra/clang-tidy/CMakeLists.txt b/clang-tools-extra/clang-tidy/CMakeLists.txt
index 80bc565f4344..89a03187d6f5 100644
--- a/clang-tools-extra/clang-tidy/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/CMakeLists.txt
@@ -7,8 +7,6 @@ add_clang_library(clangTidy
   ClangTidyModule.cpp
   ClangTidyDiagnosticConsumer.cpp
   ClangTidyOptions.cpp
-  IncludeInserter.cpp
-  IncludeSorter.cpp
 
   DEPENDS
   ClangSACheckers
diff --git a/clang-tools-extra/clang-tidy/modernize/PassByValueCheck.h b/clang-tools-extra/clang-tidy/modernize/PassByValueCheck.h
index df9b7cccbcd9..42e53c7e95eb 100644
--- a/clang-tools-extra/clang-tidy/modernize/PassByValueCheck.h
+++ b/clang-tools-extra/clang-tidy/modernize/PassByValueCheck.h
@@ -11,7 +11,7 @@
 #define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MODERNIZE_PASS_BY_VALUE_H
 
 #include "../ClangTidy.h"
-#include "../IncludeInserter.h"
+#include "../utils/IncludeInserter.h"
 
 #include <memory>
 
diff --git a/clang-tools-extra/clang-tidy/utils/CMakeLists.txt b/clang-tools-extra/clang-tidy/utils/CMakeLists.txt
index 7c13527465ab..06ae47e572e9 100644
--- a/clang-tools-extra/clang-tidy/utils/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/utils/CMakeLists.txt
@@ -2,6 +2,8 @@ set(LLVM_LINK_COMPONENTS support)
 
 add_clang_library(clangTidyUtils
   HeaderGuard.cpp
+  IncludeInserter.cpp
+  IncludeSorter.cpp
 
   LINK_LIBS
   clangAST
diff --git a/clang-tools-extra/clang-tidy/IncludeInserter.cpp b/clang-tools-extra/clang-tidy/utils/IncludeInserter.cpp
similarity index 100%
rename from clang-tools-extra/clang-tidy/IncludeInserter.cpp
rename to clang-tools-extra/clang-tidy/utils/IncludeInserter.cpp
diff --git a/clang-tools-extra/clang-tidy/IncludeInserter.h b/clang-tools-extra/clang-tidy/utils/IncludeInserter.h
similarity index 100%
rename from clang-tools-extra/clang-tidy/IncludeInserter.h
rename to clang-tools-extra/clang-tidy/utils/IncludeInserter.h
diff --git a/clang-tools-extra/clang-tidy/IncludeSorter.cpp b/clang-tools-extra/clang-tidy/utils/IncludeSorter.cpp
similarity index 100%
rename from clang-tools-extra/clang-tidy/IncludeSorter.cpp
rename to clang-tools-extra/clang-tidy/utils/IncludeSorter.cpp
diff --git a/clang-tools-extra/clang-tidy/IncludeSorter.h b/clang-tools-extra/clang-tidy/utils/IncludeSorter.h
similarity index 99%
rename from clang-tools-extra/clang-tidy/IncludeSorter.h
rename to clang-tools-extra/clang-tidy/utils/IncludeSorter.h
index 89e4bf7e4a6a..b1fe316fd48d 100644
--- a/clang-tools-extra/clang-tidy/IncludeSorter.h
+++ b/clang-tools-extra/clang-tidy/utils/IncludeSorter.h
@@ -10,7 +10,7 @@
 #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_INCLUDESORTER_H
 #define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_INCLUDESORTER_H
 
-#include "ClangTidy.h"
+#include "../ClangTidy.h"
 #include <string>
 
 namespace clang {
diff --git a/clang-tools-extra/unittests/clang-tidy/IncludeInserterTest.cpp b/clang-tools-extra/unittests/clang-tidy/IncludeInserterTest.cpp
index dec830d814cb..eb55830019c0 100644
--- a/clang-tools-extra/unittests/clang-tidy/IncludeInserterTest.cpp
+++ b/clang-tools-extra/unittests/clang-tidy/IncludeInserterTest.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "../clang-tidy/IncludeInserter.h"
+#include "../clang-tidy/utils/IncludeInserter.h"
 #include "clang/Lex/Preprocessor.h"
 #include "clang/Frontend/CompilerInstance.h"
 #include "ClangTidyTest.h"