diff --git a/Driver/ASTConsumers.cpp b/Driver/ASTConsumers.cpp
index 01014cb72a45f34ef42d9ced77dff185e0f899a8..3536ee8d9f0d5fb2bb248fd4ed92477925894136 100644
--- a/Driver/ASTConsumers.cpp
+++ b/Driver/ASTConsumers.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ASTConsumers.h"
-#include "clang/Driver/HTMLDiagnostics.h"
+#include "clang/Driver/PathDiagnosticClients.h"
 #include "clang/AST/TranslationUnit.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/SourceManager.h"
diff --git a/Driver/AnalysisConsumer.cpp b/Driver/AnalysisConsumer.cpp
index 230b17d6eede1aa54fd23781eeea53c4380479b5..aa78337ae00135cd364db0dd97f716784d8ee370 100644
--- a/Driver/AnalysisConsumer.cpp
+++ b/Driver/AnalysisConsumer.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ASTConsumers.h"
-#include "clang/Driver/HTMLDiagnostics.h"
+#include "clang/Driver/PathDiagnosticClients.h"
 #include "clang/AST/ASTConsumer.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclObjC.h"
diff --git a/Driver/clang.cpp b/Driver/clang.cpp
index 74dc7b4b4993e48c250fc5dacb7c03ee3e3bb92c..4d5e6bef313aae3cd58427e2b1410c45c95e8d5d 100644
--- a/Driver/clang.cpp
+++ b/Driver/clang.cpp
@@ -25,7 +25,7 @@
 #include "clang.h"
 #include "ASTConsumers.h"
 #include "clang/Driver/CompileOptions.h"
-#include "clang/Driver/HTMLDiagnostics.h"
+#include "clang/Driver/PathDiagnosticClients.h"
 #include "clang/Driver/InitHeaderSearch.h"
 #include "clang/Driver/TextDiagnosticBuffer.h"
 #include "clang/Driver/TextDiagnosticPrinter.h"
diff --git a/include/clang/Driver/HTMLDiagnostics.h b/include/clang/Driver/PathDiagnosticClients.h
similarity index 100%
rename from include/clang/Driver/HTMLDiagnostics.h
rename to include/clang/Driver/PathDiagnosticClients.h
diff --git a/lib/Driver/HTMLDiagnostics.cpp b/lib/Driver/HTMLDiagnostics.cpp
index 72870fefe0e965ce860062289f0b4b04ccac5983..4fac41c1bf89ffe2febf21f72051aed722e59800 100644
--- a/lib/Driver/HTMLDiagnostics.cpp
+++ b/lib/Driver/HTMLDiagnostics.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Driver/HTMLDiagnostics.h"
+#include "clang/Driver/PathDiagnosticClients.h"
 #include "clang/Analysis/PathDiagnostic.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Decl.h"