diff --git a/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp b/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
index 292c2c5..09d0e40 100644
--- a/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
+++ b/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
@@ -11,12 +11,11 @@
 
 
 #include "llvm/CodeGen/InstrScheduling.h"
-#include "llvm/Analysis/LiveVar/BBLiveVar.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineCodeForInstruction.h"
 #include "llvm/CodeGen/MachineCodeForMethod.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/CommandLine.h"
+#include "llvm/BasicBlock.h"
 #include "SchedPriorities.h"
 #include <ext/hash_set>
 #include <algorithm>
diff --git a/llvm/lib/CodeGen/InstrSched/SchedPriorities.h b/llvm/lib/CodeGen/InstrSched/SchedPriorities.h
index 78b685d..884a049 100644
--- a/llvm/lib/CodeGen/InstrSched/SchedPriorities.h
+++ b/llvm/lib/CodeGen/InstrSched/SchedPriorities.h
@@ -27,7 +27,7 @@
 #include "llvm/Target/MachineSchedInfo.h"
 #include "Support/CommandLine.h"
 #include <list>
-
+#include <hash_set>
 class Method;
 class MachineInstr;
 class SchedulingManager;
@@ -76,10 +76,9 @@
   typedef std::list<NodeDelayPair*>::const_iterator const_iterator;
   
 public:
-  /*ctor*/	  NodeHeap	() : std::list<NodeDelayPair*>(), _size(0) {}
-  /*dtor*/	  ~NodeHeap	() {}
+  NodeHeap() : _size(0) {}
   
-  inline unsigned int	size	() const { return _size; }
+  inline unsigned       size() const { return _size; }
   
   const SchedGraphNode* getNode	(const_iterator i) const { return (*i)->node; }
   cycles_t		getDelay(const_iterator i) const { return (*i)->delay;}