diff --git a/Driver/ASTConsumers.cpp b/Driver/ASTConsumers.cpp
index 3206bfd..97c0b7f 100644
--- a/Driver/ASTConsumers.cpp
+++ b/Driver/ASTConsumers.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ASTConsumers.h"
-#include "HTMLDiagnostics.h"
+#include "clang/Driver/HTMLDiagnostics.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 0700c00..9b84aa3 100644
--- a/Driver/AnalysisConsumer.cpp
+++ b/Driver/AnalysisConsumer.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ASTConsumers.h"
-#include "HTMLDiagnostics.h"
+#include "clang/Driver/HTMLDiagnostics.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 419fa98..fad1624 100644
--- a/Driver/clang.cpp
+++ b/Driver/clang.cpp
@@ -24,7 +24,7 @@
 
 #include "clang.h"
 #include "ASTConsumers.h"
-#include "HTMLDiagnostics.h"
+#include "clang/Driver/HTMLDiagnostics.h"
 #include "clang/Driver/InitHeaderSearch.h"
 #include "clang/Driver/TextDiagnosticBuffer.h"
 #include "clang/Driver/TextDiagnosticPrinter.h"
diff --git a/Driver/HTMLDiagnostics.h b/include/clang/Driver/HTMLDiagnostics.h
similarity index 100%
rename from Driver/HTMLDiagnostics.h
rename to include/clang/Driver/HTMLDiagnostics.h
diff --git a/Driver/HTMLDiagnostics.cpp b/lib/Driver/HTMLDiagnostics.cpp
similarity index 99%
rename from Driver/HTMLDiagnostics.cpp
rename to lib/Driver/HTMLDiagnostics.cpp
index 0675ec2..e691882 100644
--- a/Driver/HTMLDiagnostics.cpp
+++ b/lib/Driver/HTMLDiagnostics.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "HTMLDiagnostics.h"
+#include "clang/Driver/HTMLDiagnostics.h"
 #include "clang/Analysis/PathDiagnostic.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Decl.h"