diff --git a/llvm/lib/CodeGen/RegAlloc/InterferenceGraph.cpp b/llvm/lib/CodeGen/RegAlloc/InterferenceGraph.cpp
index d18fddacabd4..b5e26887c4e5 100644
--- a/llvm/lib/CodeGen/RegAlloc/InterferenceGraph.cpp
+++ b/llvm/lib/CodeGen/RegAlloc/InterferenceGraph.cpp
@@ -4,9 +4,9 @@
 // 
 //===----------------------------------------------------------------------===//
 
+#include "RegAllocCommon.h"
 #include "llvm/CodeGen/InterferenceGraph.h"
 #include "llvm/CodeGen/IGNode.h"
-#include "llvm/CodeGen/RegAllocCommon.h"
 #include "Support/STLExtras.h"
 #include <algorithm>
 using std::cerr;
diff --git a/llvm/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp b/llvm/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp
index 94e87b44e36d..d49b1d66398c 100644
--- a/llvm/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp
+++ b/llvm/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp
@@ -5,7 +5,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/LiveRangeInfo.h"
-#include "llvm/CodeGen/RegAllocCommon.h"
+#include "RegAllocCommon.h"
 #include "llvm/CodeGen/RegClass.h"
 #include "llvm/CodeGen/IGNode.h"
 #include "llvm/CodeGen/MachineInstr.h"
diff --git a/llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp b/llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
index 2290dc490267..724dbc7744af 100644
--- a/llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
+++ b/llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
@@ -5,8 +5,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/RegisterAllocation.h"
-#include "llvm/CodeGen/RegAllocCommon.h"
+#include "RegAllocCommon.h"
 #include "llvm/CodeGen/IGNode.h"
+#include "llvm/CodeGen/RegClass.h"
 #include "llvm/CodeGen/PhyRegAlloc.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineInstrAnnot.h"
diff --git a/llvm/lib/CodeGen/RegAlloc/RegClass.cpp b/llvm/lib/CodeGen/RegAlloc/RegClass.cpp
index 90d39870451a..1059749cd57d 100644
--- a/llvm/lib/CodeGen/RegAlloc/RegClass.cpp
+++ b/llvm/lib/CodeGen/RegAlloc/RegClass.cpp
@@ -5,7 +5,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/RegClass.h"
-#include "llvm/CodeGen/RegAllocCommon.h"
+#include "RegAllocCommon.h"
 #include "llvm/CodeGen/IGNode.h"
 using std::cerr;
 
diff --git a/llvm/lib/Target/Sparc/SparcRegInfo.cpp b/llvm/lib/Target/Sparc/SparcRegInfo.cpp
index 078d8dc85823..1c75e6587fca 100644
--- a/llvm/lib/Target/Sparc/SparcRegInfo.cpp
+++ b/llvm/lib/Target/Sparc/SparcRegInfo.cpp
@@ -14,6 +14,7 @@
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineInstrAnnot.h"
 #include "llvm/CodeGen/FunctionLiveVarInfo.h"   // FIXME: Remove
+#include "llvm/CodeGen/RegClass.h"
 #include "../../CodeGen/RegAlloc/RegAllocCommon.h"   // FIXME!
 #include "llvm/iTerminators.h"
 #include "llvm/iOther.h"