diff --git a/lib/CodeGen/InstrSched/InstrScheduling.cpp b/lib/CodeGen/InstrSched/InstrScheduling.cpp
index 0987572..494da31 100644
--- a/lib/CodeGen/InstrSched/InstrScheduling.cpp
+++ b/lib/CodeGen/InstrSched/InstrScheduling.cpp
@@ -1,4 +1,3 @@
-// $Id$
 //***************************************************************************
 // File:
 //	InstrScheduling.cpp
@@ -12,7 +11,6 @@
 #include "llvm/CodeGen/InstrScheduling.h"
 #include "llvm/CodeGen/SchedPriorities.h"
 #include "llvm/Analysis/LiveVar/BBLiveVar.h"
-#include "llvm/Target/Machine.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Instruction.h"
@@ -28,8 +26,6 @@
   clEnumValN(Sched_PrintSchedGraphs, "g", "print scheduling graphs"), 0);
 
 
-//************************* Forward Declarations ***************************/
-
 class InstrSchedule;
 class SchedulingManager;
 class DelaySlotInfo;
diff --git a/lib/CodeGen/InstrSched/SchedGraph.cpp b/lib/CodeGen/InstrSched/SchedGraph.cpp
index 3c819f6..1ad2b0f 100644
--- a/lib/CodeGen/InstrSched/SchedGraph.cpp
+++ b/lib/CodeGen/InstrSched/SchedGraph.cpp
@@ -1,5 +1,4 @@
-/*
- ****************************************************************************
+/****************************************************************************
  * File:
  *	SchedGraph.cpp
  * 
@@ -18,12 +17,10 @@
 #include "llvm/Method.h"
 #include "llvm/CodeGen/SchedGraph.h"
 #include "llvm/CodeGen/MachineInstr.h"
-#include "llvm/Target/Machine.h"
+#include "llvm/Target/InstInfo.h"
 #include "llvm/Support/StringExtras.h"
 #include <algorithm>
 
-//************************* Class Implementations **************************/
-
 // 
 // class SchedGraphEdge
 // 
diff --git a/lib/CodeGen/RegAlloc/RegClass.h b/lib/CodeGen/RegAlloc/RegClass.h
index efe1746..a8fc0ae 100644
--- a/lib/CodeGen/RegAlloc/RegClass.h
+++ b/lib/CodeGen/RegAlloc/RegClass.h
@@ -1,4 +1,4 @@
-/* Title:   RegClass.h
+/* Title:   RegClass.h   -*- C++ -*-
    Author:  Ruchira Sasanka
    Date:    Aug 20, 01
    Purpose: Contains machine independent methods for register coloring.