diff --git a/llvm/tools/llvm-mc/AsmCond.h b/llvm/include/llvm/MC/MCParser/AsmCond.h
similarity index 100%
rename from llvm/tools/llvm-mc/AsmCond.h
rename to llvm/include/llvm/MC/MCParser/AsmCond.h
diff --git a/llvm/tools/llvm-mc/AsmLexer.h b/llvm/include/llvm/MC/MCParser/AsmLexer.h
similarity index 100%
rename from llvm/tools/llvm-mc/AsmLexer.h
rename to llvm/include/llvm/MC/MCParser/AsmLexer.h
diff --git a/llvm/tools/llvm-mc/AsmParser.h b/llvm/include/llvm/MC/MCParser/AsmParser.h
similarity index 98%
rename from llvm/tools/llvm-mc/AsmParser.h
rename to llvm/include/llvm/MC/MCParser/AsmParser.h
index ef53d79ec8da..65cdc16155ed 100644
--- a/llvm/tools/llvm-mc/AsmParser.h
+++ b/llvm/include/llvm/MC/MCParser/AsmParser.h
@@ -15,8 +15,8 @@
 #define ASMPARSER_H
 
 #include <vector>
-#include "AsmLexer.h"
-#include "AsmCond.h"
+#include "llvm/MC/MCParser/AsmLexer.h"
+#include "llvm/MC/MCParser/AsmCond.h"
 #include "llvm/MC/MCParser/MCAsmParser.h"
 #include "llvm/MC/MCSectionMachO.h"
 #include "llvm/MC/MCStreamer.h"
diff --git a/llvm/tools/llvm-mc/AsmLexer.cpp b/llvm/lib/MC/MCParser/AsmLexer.cpp
similarity index 99%
rename from llvm/tools/llvm-mc/AsmLexer.cpp
rename to llvm/lib/MC/MCParser/AsmLexer.cpp
index de61e7f5b7ae..0b2e68c95b85 100644
--- a/llvm/tools/llvm-mc/AsmLexer.cpp
+++ b/llvm/lib/MC/MCParser/AsmLexer.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "AsmLexer.h"
+#include "llvm/MC/MCParser/AsmLexer.h"
 #include "llvm/Support/SMLoc.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/MC/MCAsmInfo.h"
diff --git a/llvm/tools/llvm-mc/AsmParser.cpp b/llvm/lib/MC/MCParser/AsmParser.cpp
similarity index 99%
rename from llvm/tools/llvm-mc/AsmParser.cpp
rename to llvm/lib/MC/MCParser/AsmParser.cpp
index 503addb5e6cb..e311400d7862 100644
--- a/llvm/tools/llvm-mc/AsmParser.cpp
+++ b/llvm/lib/MC/MCParser/AsmParser.cpp
@@ -11,8 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "AsmParser.h"
-
+#include "llvm/MC/MCParser/AsmParser.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/MC/MCContext.h"
diff --git a/llvm/tools/llvm-mc/CMakeLists.txt b/llvm/tools/llvm-mc/CMakeLists.txt
index fbfc2d4e26bd..49c29324d4b3 100644
--- a/llvm/tools/llvm-mc/CMakeLists.txt
+++ b/llvm/tools/llvm-mc/CMakeLists.txt
@@ -2,7 +2,5 @@ set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} support MC MCParser)
 
 add_llvm_tool(llvm-mc
   llvm-mc.cpp
-  AsmLexer.cpp
-  AsmParser.cpp
   Disassembler.cpp
   )
diff --git a/llvm/tools/llvm-mc/llvm-mc.cpp b/llvm/tools/llvm-mc/llvm-mc.cpp
index 9979df91757d..f49738bd0e81 100644
--- a/llvm/tools/llvm-mc/llvm-mc.cpp
+++ b/llvm/tools/llvm-mc/llvm-mc.cpp
@@ -32,7 +32,7 @@
 #include "llvm/Target/TargetRegistry.h"
 #include "llvm/Target/TargetMachine.h"  // FIXME.
 #include "llvm/Target/TargetSelect.h"
-#include "AsmParser.h"
+#include "llvm/MC/MCParser/AsmParser.h"
 #include "Disassembler.h"
 using namespace llvm;