diff --git a/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp b/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
index f23a22c6c44..c89e5aa0c4c 100644
--- a/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
+++ b/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
@@ -20,29 +20,29 @@
 // 
 //===----------------------------------------------------------------------===//
 
+#include "IGNode.h"
 #include "PhyRegAlloc.h"
 #include "RegAllocCommon.h"
 #include "RegClass.h"
-#include "IGNode.h"
+#include "llvm/Constants.h"
+#include "llvm/DerivedTypes.h"
+#include "llvm/iOther.h"
+#include "llvm/Module.h"
+#include "llvm/Type.h"
+#include "llvm/Analysis/LoopInfo.h"
 #include "llvm/CodeGen/FunctionLiveVarInfo.h"
 #include "llvm/CodeGen/InstrSelection.h"
+#include "llvm/CodeGen/MachineFunction.h"
+#include "llvm/CodeGen/MachineFunctionInfo.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineInstrAnnot.h"
-#include "llvm/CodeGen/MachineFunction.h"
-#include "llvm/CodeGen/MachineFunctionInfo.h"
 #include "llvm/CodeGen/Passes.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Target/TargetInstrInfo.h"
-#include "llvm/Type.h"
-#include "llvm/iOther.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Constants.h"
-#include "llvm/Module.h"
 #include "llvm/Support/InstIterator.h"
-#include "Support/STLExtras.h"
-#include "Support/SetOperations.h"
+#include "llvm/Target/TargetInstrInfo.h"
 #include "Support/CommandLine.h"
+#include "Support/SetOperations.h"
+#include "Support/STLExtras.h"
 #include <cmath>
 
 RegAllocDebugLevel_t DEBUG_RA;
diff --git a/lib/CodeGen/RegAlloc/PhyRegAlloc.h b/lib/CodeGen/RegAlloc/PhyRegAlloc.h
index b4cec8c35d5..e93c51d1246 100644
--- a/lib/CodeGen/RegAlloc/PhyRegAlloc.h
+++ b/lib/CodeGen/RegAlloc/PhyRegAlloc.h
@@ -27,8 +27,8 @@
 #include "LiveRangeInfo.h"
 #include "llvm/Pass.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
-#include "llvm/Target/TargetRegInfo.h"
 #include "llvm/Target/TargetMachine.h" 
+#include "llvm/Target/TargetRegInfo.h"
 #include <map>
 
 class MachineFunction;
@@ -136,8 +136,9 @@ private:
                             MachineBasicBlock::iterator& MII,
                             MachineBasicBlock &MBB, unsigned OpNum);
 
-  // Method for inserting caller saving code. The caller must save all the
-  // volatile registers live across a call.
+  /// Method for inserting caller saving code. The caller must save all the
+  /// volatile registers live across a call.
+  ///
   void insertCallerSavingCode(std::vector<MachineInstr*>& instrnsBefore,
                               std::vector<MachineInstr*>& instrnsAfter,
                               MachineInstr *CallMI,
@@ -154,12 +155,12 @@ private:
                           std::vector<MachineInstr*>& MIBef,
                           std::vector<MachineInstr*>& MIAft);
   
-  // Callback method used to find unused registers. 
-  // LVSetBef is the live variable set to search for an unused register.
-  // If it is not specified, the LV set before the current MI is used.
-  // This is sufficient as long as no new copy instructions are generated
-  // to copy the free register to memory.
-  // 
+  /// Callback method used to find unused registers. 
+  /// LVSetBef is the live variable set to search for an unused register.
+  /// If it is not specified, the LV set before the current MI is used.
+  /// This is sufficient as long as no new copy instructions are generated
+  /// to copy the free register to memory.
+  /// 
   int getUnusedUniRegAtMI(RegClass *RC, int RegType,
                           const MachineInstr *MI,
                           const ValueSet *LVSetBef = 0);
diff --git a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
index f23a22c6c44..c89e5aa0c4c 100644
--- a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
+++ b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
@@ -20,29 +20,29 @@
 // 
 //===----------------------------------------------------------------------===//
 
+#include "IGNode.h"
 #include "PhyRegAlloc.h"
 #include "RegAllocCommon.h"
 #include "RegClass.h"
-#include "IGNode.h"
+#include "llvm/Constants.h"
+#include "llvm/DerivedTypes.h"
+#include "llvm/iOther.h"
+#include "llvm/Module.h"
+#include "llvm/Type.h"
+#include "llvm/Analysis/LoopInfo.h"
 #include "llvm/CodeGen/FunctionLiveVarInfo.h"
 #include "llvm/CodeGen/InstrSelection.h"
+#include "llvm/CodeGen/MachineFunction.h"
+#include "llvm/CodeGen/MachineFunctionInfo.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineInstrAnnot.h"
-#include "llvm/CodeGen/MachineFunction.h"
-#include "llvm/CodeGen/MachineFunctionInfo.h"
 #include "llvm/CodeGen/Passes.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Target/TargetInstrInfo.h"
-#include "llvm/Type.h"
-#include "llvm/iOther.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Constants.h"
-#include "llvm/Module.h"
 #include "llvm/Support/InstIterator.h"
-#include "Support/STLExtras.h"
-#include "Support/SetOperations.h"
+#include "llvm/Target/TargetInstrInfo.h"
 #include "Support/CommandLine.h"
+#include "Support/SetOperations.h"
+#include "Support/STLExtras.h"
 #include <cmath>
 
 RegAllocDebugLevel_t DEBUG_RA;
diff --git a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h
index b4cec8c35d5..e93c51d1246 100644
--- a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h
+++ b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h
@@ -27,8 +27,8 @@
 #include "LiveRangeInfo.h"
 #include "llvm/Pass.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
-#include "llvm/Target/TargetRegInfo.h"
 #include "llvm/Target/TargetMachine.h" 
+#include "llvm/Target/TargetRegInfo.h"
 #include <map>
 
 class MachineFunction;
@@ -136,8 +136,9 @@ private:
                             MachineBasicBlock::iterator& MII,
                             MachineBasicBlock &MBB, unsigned OpNum);
 
-  // Method for inserting caller saving code. The caller must save all the
-  // volatile registers live across a call.
+  /// Method for inserting caller saving code. The caller must save all the
+  /// volatile registers live across a call.
+  ///
   void insertCallerSavingCode(std::vector<MachineInstr*>& instrnsBefore,
                               std::vector<MachineInstr*>& instrnsAfter,
                               MachineInstr *CallMI,
@@ -154,12 +155,12 @@ private:
                           std::vector<MachineInstr*>& MIBef,
                           std::vector<MachineInstr*>& MIAft);
   
-  // Callback method used to find unused registers. 
-  // LVSetBef is the live variable set to search for an unused register.
-  // If it is not specified, the LV set before the current MI is used.
-  // This is sufficient as long as no new copy instructions are generated
-  // to copy the free register to memory.
-  // 
+  /// Callback method used to find unused registers. 
+  /// LVSetBef is the live variable set to search for an unused register.
+  /// If it is not specified, the LV set before the current MI is used.
+  /// This is sufficient as long as no new copy instructions are generated
+  /// to copy the free register to memory.
+  /// 
   int getUnusedUniRegAtMI(RegClass *RC, int RegType,
                           const MachineInstr *MI,
                           const ValueSet *LVSetBef = 0);