diff --git a/llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp b/llvm/lib/Target/X86/X86AsmPrinter.cpp
similarity index 99%
rename from llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
rename to llvm/lib/Target/X86/X86AsmPrinter.cpp
index 5b183bbee5a3..1862306c162e 100644
--- a/llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
+++ b/llvm/lib/Target/X86/X86AsmPrinter.cpp
@@ -13,8 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "X86AsmPrinter.h"
-#include "X86ATTInstPrinter.h"
-#include "X86IntelInstPrinter.h"
+#include "AsmPrinter/X86ATTInstPrinter.h"
+#include "AsmPrinter/X86IntelInstPrinter.h"
 #include "X86MCInstLower.h"
 #include "X86.h"
 #include "X86COFFMachineModuleInfo.h"
diff --git a/llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.h b/llvm/lib/Target/X86/X86AsmPrinter.h
similarity index 96%
rename from llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.h
rename to llvm/lib/Target/X86/X86AsmPrinter.h
index b5a7f8dc321a..e61be66c75a2 100644
--- a/llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.h
+++ b/llvm/lib/Target/X86/X86AsmPrinter.h
@@ -14,9 +14,9 @@
 #ifndef X86ASMPRINTER_H
 #define X86ASMPRINTER_H
 
-#include "../X86.h"
-#include "../X86MachineFunctionInfo.h"
-#include "../X86TargetMachine.h"
+#include "X86.h"
+#include "X86MachineFunctionInfo.h"
+#include "X86TargetMachine.h"
 #include "llvm/ADT/StringSet.h"
 #include "llvm/CodeGen/AsmPrinter.h"
 #include "llvm/CodeGen/MachineModuleInfo.h"
diff --git a/llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp b/llvm/lib/Target/X86/X86MCInstLower.cpp
similarity index 100%
rename from llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp
rename to llvm/lib/Target/X86/X86MCInstLower.cpp
diff --git a/llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.h b/llvm/lib/Target/X86/X86MCInstLower.h
similarity index 100%
rename from llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.h
rename to llvm/lib/Target/X86/X86MCInstLower.h