diff --git a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp b/lib/Target/ARM/ARMAsmPrinter.cpp
similarity index 99%
rename from lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
rename to lib/Target/ARM/ARMAsmPrinter.cpp
index 7eb9b37108c..3cc6c8fa124 100644
--- a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
+++ b/lib/Target/ARM/ARMAsmPrinter.cpp
@@ -17,7 +17,7 @@
 #include "ARMBuildAttrs.h"
 #include "ARMAddressingModes.h"
 #include "ARMConstantPoolValue.h"
-#include "ARMInstPrinter.h"
+#include "AsmPrinter/ARMInstPrinter.h"
 #include "ARMMachineFunctionInfo.h"
 #include "ARMMCInstLower.h"
 #include "ARMTargetMachine.h"
diff --git a/lib/Target/ARM/AsmPrinter/ARMMCInstLower.cpp b/lib/Target/ARM/ARMMCInstLower.cpp
similarity index 100%
rename from lib/Target/ARM/AsmPrinter/ARMMCInstLower.cpp
rename to lib/Target/ARM/ARMMCInstLower.cpp
diff --git a/lib/Target/ARM/AsmPrinter/ARMMCInstLower.h b/lib/Target/ARM/ARMMCInstLower.h
similarity index 100%
rename from lib/Target/ARM/AsmPrinter/ARMMCInstLower.h
rename to lib/Target/ARM/ARMMCInstLower.h