diff --git a/llvm/utils/TableGen/GlobalISel/PatternParser.cpp b/llvm/utils/TableGen/GlobalISel/PatternParser.cpp
diff --git a/llvm/utils/TableGen/GlobalISel/PatternParser.h b/llvm/utils/TableGen/GlobalISel/PatternParser.h
diff --git a/llvm/utils/TableGen/GlobalISel/Patterns.cpp b/llvm/utils/TableGen/GlobalISel/Patterns.cpp
@@ -7,11 +7,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "Patterns.h"
+#include "../CodeGenInstruction.h"
+#include "../CodeGenIntrinsics.h"
 #include "CXXPredicates.h"
 #include "CodeExpander.h"
 #include "CodeExpansions.h"
-#include "CodeGenInstruction.h"
-#include "CodeGenIntrinsics.h"
 #include "llvm/ADT/StringSet.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"

diff --git a/llvm/utils/TableGen/GlobalISelCombinerEmitter.cpp b/llvm/utils/TableGen/GlobalISelCombinerEmitter.cpp