diff --git a/tools/llvmc2/Action.h b/include/llvm/CompilerDriver/Action.h
similarity index 100%
rename from tools/llvmc2/Action.h
rename to include/llvm/CompilerDriver/Action.h
diff --git a/tools/llvmc2/CompilationGraph.h b/include/llvm/CompilerDriver/CompilationGraph.h
similarity index 99%
rename from tools/llvmc2/CompilationGraph.h
rename to include/llvm/CompilerDriver/CompilationGraph.h
index 57758bf..f3c31ab 100644
--- a/tools/llvmc2/CompilationGraph.h
+++ b/include/llvm/CompilerDriver/CompilationGraph.h
@@ -14,7 +14,7 @@
 #ifndef LLVM_TOOLS_LLVMC2_COMPILATION_GRAPH_H
 #define LLVM_TOOLS_LLVMC2_COMPILATION_GRAPH_H
 
-#include "Tool.h"
+#include "llvm/CompilerDriver/Tool.h"
 
 #include "llvm/ADT/GraphTraits.h"
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
diff --git a/tools/llvmc2/Plugin.h b/include/llvm/CompilerDriver/Plugin.h
similarity index 100%
rename from tools/llvmc2/Plugin.h
rename to include/llvm/CompilerDriver/Plugin.h
diff --git a/tools/llvmc2/Tool.h b/include/llvm/CompilerDriver/Tool.h
similarity index 97%
rename from tools/llvmc2/Tool.h
rename to include/llvm/CompilerDriver/Tool.h
index 6f7cb8d..c422a43 100644
--- a/tools/llvmc2/Tool.h
+++ b/include/llvm/CompilerDriver/Tool.h
@@ -14,7 +14,7 @@
 #ifndef LLVM_TOOLS_LLVMC2_TOOL_H
 #define LLVM_TOOLS_LLVMC2_TOOL_H
 
-#include "Action.h"
+#include "llvm/CompilerDriver/Action.h"
 
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
 #include "llvm/ADT/StringSet.h"
diff --git a/tools/llvmc2/Action.cpp b/tools/llvmc2/Action.cpp
index 0841626..c0a1b84 100644
--- a/tools/llvmc2/Action.cpp
+++ b/tools/llvmc2/Action.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Action.h"
+#include "llvm/CompilerDriver/Action.h"
 
 #include "llvm/Support/CommandLine.h"
 #include "llvm/System/Program.h"
diff --git a/tools/llvmc2/CompilationGraph.cpp b/tools/llvmc2/CompilationGraph.cpp
index 0195395..2e83f44 100644
--- a/tools/llvmc2/CompilationGraph.cpp
+++ b/tools/llvmc2/CompilationGraph.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "Error.h"
-#include "CompilationGraph.h"
+#include "llvm/CompilerDriver/CompilationGraph.h"
 
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/CommandLine.h"
diff --git a/tools/llvmc2/Plugin.cpp b/tools/llvmc2/Plugin.cpp
index 70d9987..cd94a01 100644
--- a/tools/llvmc2/Plugin.cpp
+++ b/tools/llvmc2/Plugin.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Plugin.h"
+#include "llvm/CompilerDriver/Plugin.h"
 
 #include <vector>
 
diff --git a/tools/llvmc2/llvmc.cpp b/tools/llvmc2/llvmc.cpp
index bd5ea2b..592a133 100644
--- a/tools/llvmc2/llvmc.cpp
+++ b/tools/llvmc2/llvmc.cpp
@@ -14,9 +14,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "CompilationGraph.h"
 #include "Error.h"
-#include "Plugin.h"
+
+#include "llvm/CompilerDriver/CompilationGraph.h"
+#include "llvm/CompilerDriver/Plugin.h"
 
 #include "llvm/System/Path.h"
 #include "llvm/Support/CommandLine.h"
diff --git a/tools/llvmc2/plugins/Hello/Hello.cpp b/tools/llvmc2/plugins/Hello/Hello.cpp
index 729d3c8..a243dd8 100644
--- a/tools/llvmc2/plugins/Hello/Hello.cpp
+++ b/tools/llvmc2/plugins/Hello/Hello.cpp
@@ -11,11 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-// TODO: Since llvmc2 has now gained support for plugins, its header
-// files should be probably moved into LLVM include dir.
-
-#include "../../CompilationGraph.h"
-#include "../../Plugin.h"
+#include "llvm/CompilerDriver/CompilationGraph.h"
+#include "llvm/CompilerDriver/Plugin.h"
 
 #include <iostream>
 
diff --git a/utils/TableGen/LLVMCConfigurationEmitter.cpp b/utils/TableGen/LLVMCConfigurationEmitter.cpp
index 9bb3be3..4372903 100644
--- a/utils/TableGen/LLVMCConfigurationEmitter.cpp
+++ b/utils/TableGen/LLVMCConfigurationEmitter.cpp
@@ -1722,9 +1722,9 @@
 
 /// EmitInclude - Emit necessary #include directives.
 void EmitIncludes(std::ostream& O) {
-  O << "#include \"CompilationGraph.h\"\n"
-    << "#include \"Plugin.h\"\n"
-    << "#include \"Tool.h\"\n\n"
+  O << "#include \"llvm/CompilerDriver/CompilationGraph.h\"\n"
+    << "#include \"llvm/CompilerDriver/Plugin.h\"\n"
+    << "#include \"llvm/CompilerDriver/Tool.h\"\n\n"
 
     << "#include \"llvm/ADT/StringExtras.h\"\n"
     << "#include \"llvm/Support/CommandLine.h\"\n\n"