diff --git a/examples/clang-interpreter/main.cpp b/examples/clang-interpreter/main.cpp
index 3d0d6409d90ec34da94b1d4f692ad95276a1610b..ff86d2b368eac1665d5715bfe686b424d1abe6dc 100644
--- a/examples/clang-interpreter/main.cpp
+++ b/examples/clang-interpreter/main.cpp
@@ -24,6 +24,7 @@
 #include "llvm/Support/Host.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/Path.h"
+#include "llvm/Support/PathV1.h"
 #include "llvm/Support/TargetSelect.h"
 #include "llvm/Support/raw_ostream.h"
 using namespace clang;
diff --git a/include/clang/Driver/Compilation.h b/include/clang/Driver/Compilation.h
index 6c29b6297cce46c0fead89925d527cdc2af7f47c..77a8d887061990d2dc39617eee7d814fba08ba30 100644
--- a/include/clang/Driver/Compilation.h
+++ b/include/clang/Driver/Compilation.h
@@ -14,7 +14,6 @@
 #include "clang/Driver/Util.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/Support/Path.h"
-#include "llvm/Support/PathV1.h"
 
 namespace llvm {
 namespace opt {
diff --git a/lib/Driver/Compilation.cpp b/lib/Driver/Compilation.cpp
index 50725fc678d98df6a34db0270286bb46e63d0dc0..ef40ae4afbb6abc0ede65378fe06f5fed3c01038 100644
--- a/lib/Driver/Compilation.cpp
+++ b/lib/Driver/Compilation.cpp
@@ -16,6 +16,7 @@
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Option/ArgList.h"
+#include "llvm/Support/PathV1.h"
 #include "llvm/Support/Program.h"
 #include "llvm/Support/raw_ostream.h"
 #include <errno.h>
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index e5d3ed4cab8697543829322f86fe9f7b3802f9d7..6eeb737ebcb059a5484711041e85a1ffe898a4c8 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -30,6 +30,7 @@
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
+#include "llvm/Support/PathV1.h"
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm/Support/Program.h"
 #include "llvm/Support/raw_ostream.h"
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 0853006b121e4264652ee8b5497eabd08477da19..5c0ab55a048f4771ee4d5fdc88efc8ca1e989e40 100644
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -27,6 +27,7 @@
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Path.h"
+#include "llvm/Support/PathV1.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/system_error.h"
 
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index c7053e84fa94ccd5ade3c2a4bd9d250c4de5bbce..67ce305893f16f49b765df99b9b3939dbd58d4eb 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -31,6 +31,7 @@
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/Host.h"
+#include "llvm/Support/PathV1.h"
 #include "llvm/Support/Process.h"
 #include "llvm/Support/raw_ostream.h"
 #include <sys/stat.h>
diff --git a/lib/Driver/WindowsToolChain.cpp b/lib/Driver/WindowsToolChain.cpp
index 64625ed535b0cba7290d6bbd9b8328ccbee732c4..da914befa7c8524ca6f0afcf23a2bb3d3830ca4e 100644
--- a/lib/Driver/WindowsToolChain.cpp
+++ b/lib/Driver/WindowsToolChain.cpp
@@ -18,6 +18,7 @@
 #include "llvm/Option/ArgList.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/Path.h"
+#include "llvm/Support/PathV1.h"
 
 // Include the necessary headers to interface with the Windows registry and
 // environment.
diff --git a/lib/Tooling/Tooling.cpp b/lib/Tooling/Tooling.cpp
index e7bfba7e1269734093b8595671f6277602f7c024..4f3edf323f0958db18ea01df357544ef0c489076 100644
--- a/lib/Tooling/Tooling.cpp
+++ b/lib/Tooling/Tooling.cpp
@@ -26,6 +26,7 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Host.h"
+#include "llvm/Support/PathV1.h"
 #include "llvm/Support/raw_ostream.h"
 
 // For chdir, see the comment in ClangTool::run for more information.
diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp
index f5a2dd041df59ea048e093cf6afb9e6c8eee0282..8b02a353875707e2c71f58b1c5d54925330fe4ba 100644
--- a/tools/driver/driver.cpp
+++ b/tools/driver/driver.cpp
@@ -34,6 +34,7 @@
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Path.h"
+#include "llvm/Support/PathV1.h"
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm/Support/Program.h"
 #include "llvm/Support/Regex.h"