diff --git a/llvm/utils/TableGen/ARMDecoderEmitter.cpp b/llvm/utils/TableGen/ARMDecoderEmitter.cpp
index 0c9ef445964b..50136bcf5291 100644
--- a/llvm/utils/TableGen/ARMDecoderEmitter.cpp
+++ b/llvm/utils/TableGen/ARMDecoderEmitter.cpp
@@ -1809,7 +1809,7 @@ void ARMDecoderEmitter::ARMDEBackend::emit(raw_ostream &o) {
     assert(0 && "Unreachable code!");
   }
 
-  o << "#include \"llvm/Support/DataTypes.h\"\n";
+  o << "#include \"llvm/System/DataTypes.h\"\n";
   o << "#include <assert.h>\n";
   o << '\n';
   o << "namespace llvm {\n\n";
diff --git a/llvm/utils/TableGen/ARMDecoderEmitter.h b/llvm/utils/TableGen/ARMDecoderEmitter.h
index 66147e2f8cda..107e0851ba1b 100644
--- a/llvm/utils/TableGen/ARMDecoderEmitter.h
+++ b/llvm/utils/TableGen/ARMDecoderEmitter.h
@@ -17,7 +17,7 @@
 
 #include "TableGenBackend.h"
 
-#include "llvm/Support/DataTypes.h"
+#include "llvm/System/DataTypes.h"
 
 namespace llvm {