Standardize header file comments

llvm-svn: 8782

84 files changed, 101 insertions, 113 deletions

diff --git a/llvm/include/Support/BitSetVector.h b/llvm/include/Support/BitSetVector.h
index cdcd52d9486..fa2598a2856 100644
--- a/llvm/include/Support/BitSetVector.h
+++ b/llvm/include/Support/BitSetVector.h
@@ -1,13 +1,11 @@
-//===-- BitVectorSet.h - A bit-vector representation of sets -----*- C++ -*--=//
+//===-- BitVectorSet.h - A bit-vector representation of sets ----*- C++ -*-===//
 //
-// class BitVectorSet --
-// 
-// An implementation of the bit-vector representation of sets.
-// Unlike vector<bool>, this allows much more efficient parallel set
-// operations on bits, by using the bitset template .  The bitset template
-// unfortunately can only represent sets with a size chosen at compile-time.
-// We therefore use a vector of bitsets.  The maxmimum size of our sets
-// (i.e., the size of the universal set) can be chosen at creation time.
+// This is an implementation of the bit-vector representation of sets.  Unlike
+// vector<bool>, this allows much more efficient parallel set operations on
+// bits, by using the bitset template.  The bitset template unfortunately can
+// only represent sets with a size chosen at compile-time.  We therefore use a
+// vector of bitsets.  The maxmimum size of our sets (i.e., the size of the
+// universal set) can be chosen at creation time.
 //
 // External functions:
 // 
diff --git a/llvm/include/Support/Casting.h b/llvm/include/Support/Casting.h
index 2815ecde71d..fc2d4b21ea1 100644
--- a/llvm/include/Support/Casting.h
+++ b/llvm/include/Support/Casting.h
@@ -1,4 +1,4 @@
-//===-- Support/Casting.h - Allow flexible, checked, casts -------*- C++ -*--=//
+//===-- Support/Casting.h - Allow flexible, checked, casts ------*- C++ -*-===//
 //
 // This file defines the isa<X>(), cast<X>(), dyn_cast<X>(), cast_or_null<X>(),
 // and dyn_cast_or_null<X>() templates.
diff --git a/llvm/include/Support/CommandLine.h b/llvm/include/Support/CommandLine.h
index 789679e3990..179bca378ba 100644
--- a/llvm/include/Support/CommandLine.h
+++ b/llvm/include/Support/CommandLine.h
@@ -1,4 +1,4 @@
-//===- Support/CommandLine.h - Flexible Command line parser ------*- C++ -*--=//
+//===- Support/CommandLine.h - Flexible Command line parser -----*- C++ -*-===//
 //
 // This class implements a command line argument processor that is useful when
 // creating a tool.  It provides a simple, minimalistic interface that is easily
diff --git a/llvm/include/Support/DOTGraphTraits.h b/llvm/include/Support/DOTGraphTraits.h
index 2371b664077..6ffade878b1 100644
--- a/llvm/include/Support/DOTGraphTraits.h
+++ b/llvm/include/Support/DOTGraphTraits.h
@@ -1,4 +1,4 @@
-//===-- Support/DotGraphTraits.h - Customize .dot output -------*- C++ -*--===//
+//===-- Support/DotGraphTraits.h - Customize .dot output --------*- C++ -*-===//
 //
 // This file defines a template class that can be used to customize dot output
 // graphs generated by the GraphWriter.h file.  The default implementation of
diff --git a/llvm/include/Support/DataTypes.h b/llvm/include/Support/DataTypes.h
index 84f3c2b3566..eb933216d81 100644
--- a/llvm/include/Support/DataTypes.h
+++ b/llvm/include/Support/DataTypes.h
@@ -1,4 +1,4 @@
-//===-- include/Support/DataTypes.h - Define fixed size types ----*- C++ -*--=//
+//===-- include/Support/DataTypes.h - Define fixed size types ---*- C++ -*-===//
 //
 // This file contains definitions to figure out the size of _HOST_ data types.
 // This file is important because different host OS's define different macros,
diff --git a/llvm/include/Support/DepthFirstIterator.h b/llvm/include/Support/DepthFirstIterator.h
index 2bb2e68e670..967a0e145ac 100644
--- a/llvm/include/Support/DepthFirstIterator.h
+++ b/llvm/include/Support/DepthFirstIterator.h
@@ -1,4 +1,4 @@
-//===- Support/DepthFirstIterator.h - Depth First iterator -------*- C++ -*--=//
+//===- Support/DepthFirstIterator.h - Depth First iterator ------*- C++ -*-===//
 //
 // This file builds on the Support/GraphTraits.h file to build generic depth
 // first graph iterator.
diff --git a/llvm/include/Support/EquivalenceClasses.h b/llvm/include/Support/EquivalenceClasses.h
index 96cfc87a725..dab5d73257c 100644
--- a/llvm/include/Support/EquivalenceClasses.h
+++ b/llvm/include/Support/EquivalenceClasses.h
@@ -1,12 +1,11 @@
-//===-- Support/EquivalenceClasses.h -------------------------*- C++ -*--=//
+//===-- Support/EquivalenceClasses.h ----------------------------*- C++ -*-===//
 // 
-// Generic implementation of equivalence classes and implementation of 
-// union-find algorithms
-// A not-so-fancy implementation: 2 level tree i.e root and one more level
-// Overhead of a union = size of the equivalence class being attached
-// Overhead of a find = 1.
+// Generic implementation of equivalence classes and implementation of
+// union-find algorithms A not-so-fancy implementation: 2 level tree i.e root
+// and one more level Overhead of a union = size of the equivalence class being
+// attached Overhead of a find = 1.
 // 
-//===------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===//
 
 #ifndef SUPPORT_EQUIVALENCECLASSES_H
 #define SUPPORT_EQUIVALENCECLASSES_H
@@ -68,7 +67,6 @@ public:
       return EqClass;
     
     ElemTy classLeader = Elem2ECLeaderMap[Element1];
-
     for (typename std::map<ElemTy, ElemTy>::iterator ElemI = 
 	   Elem2ECLeaderMap.begin(), ElemE = Elem2ECLeaderMap.end(); 
 	 ElemI != ElemE; ++ElemI) {
@@ -77,13 +75,11 @@ public:
     }
     
     return EqClass;
-    
   }
 
   std::map<ElemTy, ElemTy>& getLeaderMap() {
     return Elem2ECLeaderMap ;
   }
-  
 };
 
 #endif
diff --git a/llvm/include/Support/GraphTraits.h b/llvm/include/Support/GraphTraits.h
index 15c285da170..e54d9631294 100644
--- a/llvm/include/Support/GraphTraits.h
+++ b/llvm/include/Support/GraphTraits.h
@@ -1,4 +1,4 @@
-//===-- Support/GraphTraits.h - Graph traits template ------------*- C++ -*--=//
+//===-- Support/GraphTraits.h - Graph traits template -----------*- C++ -*-===//
 //
 // This file defines the little GraphTraits<X> template class that should be 
 // specialized by classes that want to be iteratable by generic graph iterators.
diff --git a/llvm/include/Support/GraphWriter.h b/llvm/include/Support/GraphWriter.h
index 3b7b3575544..7b21dbf30f0 100644
--- a/llvm/include/Support/GraphWriter.h
+++ b/llvm/include/Support/GraphWriter.h
@@ -1,4 +1,4 @@
-//===-- Support/GraphWriter.h - Write a graph to a .dot file ---*- C++ -*--===//
+//===-- Support/GraphWriter.h - Write a graph to a .dot file ----*- C++ -*-===//
 //
 // This file defines a simple interface that can be used to print out generic
 // LLVM graphs to ".dot" files.  "dot" is a tool that is part of the AT&T
diff --git a/llvm/include/Support/HashExtras.h b/llvm/include/Support/HashExtras.h
index 44355a48e96..f648a28c099 100644
--- a/llvm/include/Support/HashExtras.h
+++ b/llvm/include/Support/HashExtras.h
@@ -1,4 +1,4 @@
-//===-- HashExtras.h - Useful functions for STL hash containers --*- C++ -*--=//
+//===-- HashExtras.h - Useful functions for STL hash containers -*- C++ -*-===//
 //
 // This file contains some templates that are useful if you are working with the
 // STL Hashed containers.
diff --git a/llvm/include/Support/MathExtras.h b/llvm/include/Support/MathExtras.h
index bfb88552bf5..ea3bba40c9c 100644
--- a/llvm/include/Support/MathExtras.h
+++ b/llvm/include/Support/MathExtras.h
@@ -1,4 +1,4 @@
-//===-- Support/MathExtras.h - Useful math functions -------------*- C++ -*--=//
+//===-- Support/MathExtras.h - Useful math functions ------------*- C++ -*-===//
 //
 // This file contains some functions that are useful for math stuff.
 //
diff --git a/llvm/include/Support/PostOrderIterator.h b/llvm/include/Support/PostOrderIterator.h
index d976f088764..2e5a0ad336d 100644
--- a/llvm/include/Support/PostOrderIterator.h
+++ b/llvm/include/Support/PostOrderIterator.h
@@ -1,4 +1,4 @@
-//===-- Support/PostOrderIterator.h - Generic PostOrder iterator -*- C++ -*--=//
+//===- Support/PostOrderIterator.h - Generic PostOrder iterator -*- C++ -*-===//
 //
 // This file builds on the Support/GraphTraits.h file to build a generic graph
 // post order iterator.  This should work over any graph type that has a
diff --git a/llvm/include/Support/STLExtras.h b/llvm/include/Support/STLExtras.h
index 348c4e17aac..012d0024273 100644
--- a/llvm/include/Support/STLExtras.h
+++ b/llvm/include/Support/STLExtras.h
@@ -1,4 +1,4 @@
-//===-- STLExtras.h - Useful functions when working with the STL -*- C++ -*--=//
+//===- STLExtras.h - Useful functions when working with the STL -*- C++ -*-===//
 //
 // This file contains some templates that are useful if you are working with the
 // STL at all.
diff --git a/llvm/include/Support/SetOperations.h b/llvm/include/Support/SetOperations.h
index 3a5e6f2bd46..fe020b87dae 100644
--- a/llvm/include/Support/SetOperations.h
+++ b/llvm/include/Support/SetOperations.h
@@ -1,4 +1,4 @@
-//===-- Support/SetOperations.h - Generic Set Operations ---------*- C++ -*--=//
+//===-- Support/SetOperations.h - Generic Set Operations --------*- C++ -*-===//
 //
 // This file defines generic set operations that may be used on set's of
 // different types, and different element types.
diff --git a/llvm/include/Support/Signals.h b/llvm/include/Support/Signals.h
index 1445bd461db..218cf99a244 100644
--- a/llvm/include/Support/Signals.h
+++ b/llvm/include/Support/Signals.h
@@ -1,4 +1,4 @@
-//===- Support/Signals.h - Signal Handling support -------------*- C++ -*-===//
+//===- Support/Signals.h - Signal Handling support --------------*- C++ -*-===//
 //
 // This file defines some helpful functions for dealing with the possibility of
 // unix signals occuring while your program is running.
diff --git a/llvm/include/Support/StringExtras.h b/llvm/include/Support/StringExtras.h
index 924f6c35f87..9233d6c0cd4 100644
--- a/llvm/include/Support/StringExtras.h
+++ b/llvm/include/Support/StringExtras.h
@@ -1,4 +1,4 @@
-//===-- Support/StringExtras.h - Useful string functions ---------*- C++ -*--=//
+//===-- Support/StringExtras.h - Useful string functions --------*- C++ -*-===//
 //
 // This file contains some functions that are useful when dealing with strings.
 //
diff --git a/llvm/include/Support/SystemUtils.h b/llvm/include/Support/SystemUtils.h
index 26371c93dcc..01c8189723b 100644
--- a/llvm/include/Support/SystemUtils.h
+++ b/llvm/include/Support/SystemUtils.h
@@ -1,4 +1,4 @@
-//===- SystemUtils.h - Utilities to do low-level system stuff --*- C++ -*--===//
+//===- SystemUtils.h - Utilities to do low-level system stuff ---*- C++ -*-===//
 //
 // This file contains functions used to do a variety of low-level, often
 // system-specific, tasks.
diff --git a/llvm/include/Support/Tree.h b/llvm/include/Support/Tree.h
index 928c99bca95..15572614b0e 100644
--- a/llvm/include/Support/Tree.h
+++ b/llvm/include/Support/Tree.h
@@ -1,4 +1,4 @@
-//===- Support/Tree.h - Generic n-way tree structure -------------*- C++ -*--=//
+//===- Support/Tree.h - Generic n-way tree structure ------------*- C++ -*-===//
 //
 // This class defines a generic N way tree node structure.  The tree structure
 // is immutable after creation, but the payload contained within it is not.
diff --git a/llvm/include/Support/TypeInfo.h b/llvm/include/Support/TypeInfo.h
index 9884f65e691..488f56dc0f4 100644
--- a/llvm/include/Support/TypeInfo.h
+++ b/llvm/include/Support/TypeInfo.h
@@ -1,4 +1,4 @@
-//===- Support/TypeInfo.h - Support class for type_info objects --*- C++ -*--=//
+//===- Support/TypeInfo.h - Support class for type_info objects -*- C++ -*-===//
 //
 // This class makes std::type_info objects behave like first class objects that
 // can be put in maps and hashtables.  This code is based off of code in the
diff --git a/llvm/include/Support/hash_map b/llvm/include/Support/hash_map
index b6eda7a0127..6e1ca2c6eda 100644
--- a/llvm/include/Support/hash_map
+++ b/llvm/include/Support/hash_map
@@ -1,5 +1,4 @@
 //===-- Support/hash_map - "Portable" wrapper around hash_map ---*- C++ -*-===//
-// vim:ft=cpp
 // 
 // This file provides a wrapper around the mysterious <hash_map> header file
 // that seems to move around between GCC releases into and out of namespaces at
diff --git a/llvm/include/Support/ilist b/llvm/include/Support/ilist
index aa6e09c319d..14683081d09 100644
--- a/llvm/include/Support/ilist
+++ b/llvm/include/Support/ilist
@@ -1,4 +1,4 @@
-//===-- <Support/ilist> - Intrusive Linked List Template ---------*- C++ -*--=//
+//===-- Support/ilist - Intrusive Linked List Template ----------*- C++ -*-===//
 //
 // This file defines classes to implement an intrusive doubly linked list class
 // (ie each node of the list must contain a next and previous field for the
diff --git a/llvm/include/llvm/AbstractTypeUser.h b/llvm/include/llvm/AbstractTypeUser.h
index 7c6f429dc60..58596179652 100644
--- a/llvm/include/llvm/AbstractTypeUser.h
+++ b/llvm/include/llvm/AbstractTypeUser.h
@@ -1,4 +1,4 @@
-//===-- llvm/AbstractTypeUser.h - AbstractTypeUser Interface -----*- C++ -*--=//
+//===-- llvm/AbstractTypeUser.h - AbstractTypeUser Interface ----*- C++ -*-===//
 //
 // The AbstractTypeUser class is an interface to be implemented by classes who
 // could possible use an abstract type.  Abstract types are denoted by the
diff --git a/llvm/include/llvm/Analysis/CallGraph.h b/llvm/include/llvm/Analysis/CallGraph.h
index f3bc052ff89..a898c5eb1b2 100644
--- a/llvm/include/llvm/Analysis/CallGraph.h
+++ b/llvm/include/llvm/Analysis/CallGraph.h
@@ -1,4 +1,4 @@
-//===- CallGraph.h - Build a Module's call graph -----------------*- C++ -*--=//
+//===- CallGraph.h - Build a Module's call graph ----------------*- C++ -*-===//
 //
 // This interface is used to build and manipulate a call graph, which is a very 
 // useful tool for interprocedural optimization.
diff --git a/llvm/include/llvm/Analysis/ConstantsScanner.h b/llvm/include/llvm/Analysis/ConstantsScanner.h
index 8035409bbf9..1d716767324 100644
--- a/llvm/include/llvm/Analysis/ConstantsScanner.h
+++ b/llvm/include/llvm/Analysis/ConstantsScanner.h
@@ -1,4 +1,4 @@
-//==-- llvm/Analysis/ConstantsScanner.h - Iterate over constants -*- C++ -*-==//
+//==- llvm/Analysis/ConstantsScanner.h - Iterate over constants -*- C++ -*-===//
 //
 // This class implements an iterator to walk through the constants referenced by
 // a method.  This is used by the Bytecode & Assembly writers to build constant
diff --git a/llvm/include/llvm/Analysis/Expressions.h b/llvm/include/llvm/Analysis/Expressions.h
index ea336bd46d7..8fb8b522c1c 100644
--- a/llvm/include/llvm/Analysis/Expressions.h
+++ b/llvm/include/llvm/Analysis/Expressions.h
@@ -1,4 +1,4 @@
-//===- llvm/Analysis/Expressions.h - Expression Analysis Utils ---*- C++ -*--=//
+//===- llvm/Analysis/Expressions.h - Expression Analysis Utils --*- C++ -*-===//
 //
 // This file defines a package of expression analysis utilties:
 //
diff --git a/llvm/include/llvm/Analysis/FindUnsafePointerTypes.h b/llvm/include/llvm/Analysis/FindUnsafePointerTypes.h
index e4e33df6b08..c920f27c12d 100644
--- a/llvm/include/llvm/Analysis/FindUnsafePointerTypes.h
+++ b/llvm/include/llvm/Analysis/FindUnsafePointerTypes.h
@@ -1,4 +1,4 @@
-//===- llvm/Analysis/FindUnsafePointerTypes.h - Unsafe pointers ---*- C++ -*-=//
+//===- llvm/Analysis/FindUnsafePointerTypes.h - Unsafe pointers -*- C++ -*-===//
 //
 // This file defines a pass that can be used to determine, interprocedurally, 
 // which pointer types are accessed unsafely in a program.  If there is an
diff --git a/llvm/include/llvm/Analysis/FindUsedTypes.h b/llvm/include/llvm/Analysis/FindUsedTypes.h
index 21fcabc1902..64874162219 100644
--- a/llvm/include/llvm/Analysis/FindUsedTypes.h
+++ b/llvm/include/llvm/Analysis/FindUsedTypes.h
@@ -1,4 +1,4 @@
-//===- llvm/Analysis/FindUsedTypes.h - Find all Types in use -----*- C++ -*--=//
+//===- llvm/Analysis/FindUsedTypes.h - Find all Types in use ----*- C++ -*-===//
 //
 // This pass is used to seek out all of the types in use by the program.
 //
diff --git a/llvm/include/llvm/Analysis/InstForest.h b/llvm/include/llvm/Analysis/InstForest.h
index f49fa98ff37..e0047965f1b 100644
--- a/llvm/include/llvm/Analysis/InstForest.h
+++ b/llvm/include/llvm/Analysis/InstForest.h
@@ -1,4 +1,4 @@
-//===- llvm/Analysis/InstForest.h - Partition Func into forest ---*- C++ -*--=//
+//===- llvm/Analysis/InstForest.h - Partition Func into forest --*- C++ -*-===//
 //
 // This interface is used to partition a method into a forest of instruction
 // trees, where the following invariants hold:
diff --git a/llvm/include/llvm/Analysis/Interval.h b/llvm/include/llvm/Analysis/Interval.h
index 13a6f45e860..3974c728716 100644
--- a/llvm/include/llvm/Analysis/Interval.h
+++ b/llvm/include/llvm/Analysis/Interval.h
@@ -1,4 +1,4 @@
-//===- llvm/Analysis/Interval.h - Interval Class Declaration -----*- C++ -*--=//
+//===- llvm/Analysis/Interval.h - Interval Class Declaration ----*- C++ -*-===//
 //
 // This file contains the declaration of the Interval class, which
 // represents a set of CFG nodes and is a portion of an interval partition.
diff --git a/llvm/include/llvm/Analysis/IntervalIterator.h b/llvm/include/llvm/Analysis/IntervalIterator.h
index e533f8ac16f..0943eda7037 100644
--- a/llvm/include/llvm/Analysis/IntervalIterator.h
+++ b/llvm/include/llvm/Analysis/IntervalIterator.h
@@ -1,4 +1,4 @@
-//===- IntervalIterator.h - Interval Iterator Declaration --------*- C++ -*--=//
+//===- IntervalIterator.h - Interval Iterator Declaration -------*- C++ -*-===//
 //
 // This file defines an iterator that enumerates the intervals in a control flow
 // graph of some sort.  This iterator is parametric, allowing iterator over the
diff --git a/llvm/include/llvm/Analysis/IntervalPartition.h b/llvm/include/llvm/Analysis/IntervalPartition.h
index 508f00589bc..b03ac1f9726 100644
--- a/llvm/include/llvm/Analysis/IntervalPartition.h
+++ b/llvm/include/llvm/Analysis/IntervalPartition.h
@@ -1,4 +1,4 @@
-//===- IntervalPartition.h - Interval partition Calculation ------*- C++ -*--=//
+//===- IntervalPartition.h - Interval partition Calculation -----*- C++ -*-===//
 //
 // This file contains the declaration of the IntervalPartition class, which
 // calculates and represents the interval partition of a function, or a
diff --git a/llvm/include/llvm/Analysis/LoopInfo.h b/llvm/include/llvm/Analysis/LoopInfo.h
index df1a091c0da..9a43cce5406 100644
--- a/llvm/include/llvm/Analysis/LoopInfo.h
+++ b/llvm/include/llvm/Analysis/LoopInfo.h
@@ -1,4 +1,4 @@
-//===- llvm/Analysis/LoopInfo.h - Natural Loop Calculator --------*- C++ -*--=//
+//===- llvm/Analysis/LoopInfo.h - Natural Loop Calculator -------*- C++ -*-===//
 //
 // This file defines the LoopInfo class that is used to identify natural loops
 // and determine the loop depth of various nodes of the CFG.  Note that natural
diff --git a/llvm/include/llvm/Analysis/PostDominators.h b/llvm/include/llvm/Analysis/PostDominators.h
index 8463136ea19..6e5e0981a15 100644
--- a/llvm/include/llvm/Analysis/PostDominators.h
+++ b/llvm/include/llvm/Analysis/PostDominators.h
@@ -1,4 +1,4 @@
-//=- llvm/Analysis/PostDominators.h - Post Dominator Calculation -*- C++ -*--=//
+//=- llvm/Analysis/PostDominators.h - Post Dominator Calculation-*- C++ -*-===//
 //
 // This file exposes interfaces to post dominance information.
 //
diff --git a/llvm/include/llvm/Analysis/Verifier.h b/llvm/include/llvm/Analysis/Verifier.h
index 645f1fa3311..20fbec7764e 100644
--- a/llvm/include/llvm/Analysis/Verifier.h
+++ b/llvm/include/llvm/Analysis/Verifier.h
@@ -1,4 +1,4 @@
-//===-- llvm/Analysis/Verifier.h - Module Verifier ---------------*- C++ -*-==//
+//===-- llvm/Analysis/Verifier.h - Module Verifier --------------*- C++ -*-===//
 //
 // This file defines the function verifier interface, that can be used for some
 // sanity checking of input to the system, and for checking that transformations
diff --git a/llvm/include/llvm/Assembly/CWriter.h b/llvm/include/llvm/Assembly/CWriter.h
index 0608870f471..0f907c19317 100644
--- a/llvm/include/llvm/Assembly/CWriter.h
+++ b/llvm/include/llvm/Assembly/CWriter.h
@@ -1,4 +1,4 @@
-//===-- llvm/Assembly/CWriter.h - C Printer for LLVM programs --*- C++ -*--===//
+//===-- llvm/Assembly/CWriter.h - C Printer for LLVM programs ---*- C++ -*-===//
 //
 // This functionality is implemented by the lib/CWriter library.  This library
 // is used to print C language files to an iostream.
diff --git a/llvm/include/llvm/Assembly/CachedWriter.h b/llvm/include/llvm/Assembly/CachedWriter.h
index c1ef1037ee3..a0f05cf6779 100644
--- a/llvm/include/llvm/Assembly/CachedWriter.h
+++ b/llvm/include/llvm/Assembly/CachedWriter.h
@@ -1,4 +1,4 @@
-//===-- llvm/Assembly/CachedWriter.h - Printer Accellerator ------*- C++ -*--=//
+//===-- llvm/Assembly/CachedWriter.h - Printer Accellerator -----*- C++ -*-===//
 //
 // This file defines a 'CacheWriter' class that is used to accelerate printing
 // chunks of LLVM.  This is used when a module is not being changed, but random
diff --git a/llvm/include/llvm/Assembly/Parser.h b/llvm/include/llvm/Assembly/Parser.h
index b54617ad6d1..e0855410a97 100644
--- a/llvm/include/llvm/Assembly/Parser.h
+++ b/llvm/include/llvm/Assembly/Parser.h
@@ -1,4 +1,4 @@
-//===-- llvm/Assembly/Parser.h - Parser for VM assembly files ----*- C++ -*--=//
+//===-- llvm/Assembly/Parser.h - Parser for VM assembly files ---*- C++ -*-===//
 //
 //  These classes are implemented by the lib/AsmParser library.
 //
@@ -27,8 +27,7 @@ Module *ParseAssemblyFile(const std::string &Filename);// throw (ParseException)
 // ParseException - For when an exceptional event is generated by the parser.
 // This class lets you print out the exception message
 //
-class ParseException {
-public:
+struct ParseException {
   ParseException(const std::string &filename, const std::string &message, 
 		 int LineNo = -1, int ColNo = -1);
 
diff --git a/llvm/include/llvm/Assembly/PrintModulePass.h b/llvm/include/llvm/Assembly/PrintModulePass.h
index a86f13cf7fb..1100e23cd9c 100644
--- a/llvm/include/llvm/Assembly/PrintModulePass.h
+++ b/llvm/include/llvm/Assembly/PrintModulePass.h
@@ -1,4 +1,4 @@
-//===- llvm/Assembly/PrintModulePass.h - Printing Pass -----------*- C++ -*--=//
+//===- llvm/Assembly/PrintModulePass.h - Printing Pass ----------*- C++ -*-===//
 //
 // This file defines two passes to print out a module.  The PrintModulePass pass
 // simply prints out the entire module when it is executed.  The
diff --git a/llvm/include/llvm/Assembly/Writer.h b/llvm/include/llvm/Assembly/Writer.h
index f87dc12ad0f..dea44d07cba 100644
--- a/llvm/include/llvm/Assembly/Writer.h
+++ b/llvm/include/llvm/Assembly/Writer.h
@@ -1,4 +1,4 @@
-//===-- llvm/Assembly/Writer.h - Printer for VM assembly files ---*- C++ -*--=//
+//===-- llvm/Assembly/Writer.h - Printer for VM assembly files --*- C++ -*-===//
 //
 // This functionality is implemented by the lib/Assembly/Writer library.
 // This library is used to print VM assembly language files to an iostream. It
@@ -21,14 +21,12 @@ class Type;
 class Module;
 class Value;
 
-
 // WriteTypeSymbolic - This attempts to write the specified type as a symbolic
 // type, iff there is an entry in the modules symbol table for the specified
 // type or one of it's component types.  This is slower than a simple x << Type;
 //
 std::ostream &WriteTypeSymbolic(std::ostream &, const Type *, const Module *M);
 
-
 // WriteAsOperand - Write the name of the specified value out to the specified
 // ostream.  This can be useful when you just want to print int %reg126, not the
 // whole instruction that generated it.  If you specify a Module for context,
diff --git a/llvm/include/llvm/BasicBlock.h b/llvm/include/llvm/BasicBlock.h
index f4c75f11340..ab8e3b4d24a 100644
--- a/llvm/include/llvm/BasicBlock.h
+++ b/llvm/include/llvm/BasicBlock.h
@@ -1,4 +1,4 @@
-//===-- llvm/BasicBlock.h - Represent a basic block in the VM ----*- C++ -*--=//
+//===-- llvm/BasicBlock.h - Represent a basic block in the VM ---*- C++ -*-===//
 ///
 /// \class BasicBlock
 ///
diff --git a/llvm/include/llvm/Bytecode/Format.h b/llvm/include/llvm/Bytecode/Format.h
index 4edc0915b03..846bbb72601 100644
--- a/llvm/include/llvm/Bytecode/Format.h
+++ b/llvm/include/llvm/Bytecode/Format.h
@@ -1,4 +1,4 @@
-//===-- llvm/Bytecode/Format.h - VM bytecode file format info ----*- C++ -*--=//
+//===-- llvm/Bytecode/Format.h - VM bytecode file format info ---*- C++ -*-===//
 //
 // This header defines intrinsic constants that are useful to libraries that 
 // need to hack on bytecode files directly, like the reader and writer.
@@ -24,7 +24,7 @@ public:
     ModuleGlobalInfo,
     GlobalTypePlane,
 
-    // Method subtypes:
+    // Function subtypes:
     MethodInfo = 0x21,
     // Can also have ConstantPool block
     // Can also have SymbolTable block
diff --git a/llvm/include/llvm/Bytecode/Primitives.h b/llvm/include/llvm/Bytecode/Primitives.h
index a8094af337c..97548ccb3d4 100644
--- a/llvm/include/llvm/Bytecode/Primitives.h
+++ b/llvm/include/llvm/Bytecode/Primitives.h
@@ -1,4 +1,4 @@
-//===-- llvm/Bytecode/Primitives.h - Bytecode file format prims --*- C++ -*--=//
+//===-- llvm/Bytecode/Primitives.h - Bytecode file format prims -*- C++ -*-===//
 //
 // This header defines some basic functions for reading and writing basic 
 // primitive types to a bytecode stream.
diff --git a/llvm/include/llvm/Bytecode/Reader.h b/llvm/include/llvm/Bytecode/Reader.h
index baf0603d3bf..e195a322d1a 100644
--- a/llvm/include/llvm/Bytecode/Reader.h
+++ b/llvm/include/llvm/Bytecode/Reader.h
@@ -1,4 +1,4 @@
-//===-- llvm/Bytecode/Reader.h - Reader for VM bytecode files ----*- C++ -*--=//
+//===-- llvm/Bytecode/Reader.h - Reader for VM bytecode files ---*- C++ -*-===//
 //
 // This functionality is implemented by the lib/Bytecode/Reader library.
 // This library is used to read VM bytecode files from an iostream.
diff --git a/llvm/include/llvm/Bytecode/WriteBytecodePass.h b/llvm/include/llvm/Bytecode/WriteBytecodePass.h
index 1141a423464..1006cb6939a 100644
--- a/llvm/include/llvm/Bytecode/WriteBytecodePass.h
+++ b/llvm/include/llvm/Bytecode/WriteBytecodePass.h
@@ -1,4 +1,4 @@
-//===- llvm/Bytecode/WriteBytecodePass.h - Bytecode Writer Pass --*- C++ -*--=//
+//===- llvm/Bytecode/WriteBytecodePass.h - Bytecode Writer Pass -*- C++ -*-===//
 //
 // This file defines a simple pass to write the working module to a file after
 // pass processing is completed.
diff --git a/llvm/include/llvm/Bytecode/Writer.h b/llvm/include/llvm/Bytecode/Writer.h
index b4d5e78fd04..0113f78a38c 100644
--- a/llvm/include/llvm/Bytecode/Writer.h
+++ b/llvm/include/llvm/Bytecode/Writer.h
@@ -1,4 +1,4 @@
-//===-- llvm/Bytecode/Writer.h - Writer for VM bytecode files ----*- C++ -*--=//
+//===-- llvm/Bytecode/Writer.h - Writer for VM bytecode files ---*- C++ -*-===//
 //
 // This functionality is implemented by the lib/BytecodeWriter library.
 // This library is used to write VM bytecode files to an iostream.  First, you
diff --git a/llvm/include/llvm/CodeGen/InstrForest.h b/llvm/include/llvm/CodeGen/InstrForest.h
index 1927b337586..c770513ade6 100644
--- a/llvm/include/llvm/CodeGen/InstrForest.h
+++ b/llvm/include/llvm/CodeGen/InstrForest.h
@@ -1,4 +1,4 @@
-//===-- llvm/CodeGen/InstForest.h ------------------------------*- C++ -*--===//
+//===-- llvm/CodeGen/InstForest.h -------------------------------*- C++ -*-===//
 //
 // Purpose:
 //	Convert SSA graph to instruction trees for instruction selection.
diff --git a/llvm/include/llvm/CodeGen/InstrScheduling.h b/llvm/include/llvm/CodeGen/InstrScheduling.h
index 1e9c0dcf500..1f04d02bc18 100644
--- a/llvm/include/llvm/CodeGen/InstrScheduling.h
+++ b/llvm/include/llvm/CodeGen/InstrScheduling.h
@@ -1,4 +1,4 @@
-//===-- InstrScheduling.h - Interface To Instruction Scheduling --*- C++ -*-==//
+//===-- InstrScheduling.h - Interface To Instruction Scheduling -*- C++ -*-===//
 //
 // This file defines a minimal, but complete, interface to instruction
 // scheduling.
@@ -21,6 +21,6 @@ class TargetMachine;
 //   are still in SSA form.
 //---------------------------------------------------------------------------
 
-FunctionPass *createInstructionSchedulingWithSSAPass(const TargetMachine &Target);
+FunctionPass *createInstructionSchedulingWithSSAPass(const TargetMachine &TM);
 
 #endif
diff --git a/llvm/include/llvm/CodeGen/MachineInstr.h b/llvm/include/llvm/CodeGen/MachineInstr.h
index 60707ba71ef..f171d776cc9 100644
--- a/llvm/include/llvm/CodeGen/MachineInstr.h
+++ b/llvm/include/llvm/CodeGen/MachineInstr.h
@@ -1,4 +1,4 @@
-//===-- llvm/CodeGen/MachineInstr.h - MachineInstr class ---------*- C++ -*--=//
+//===-- llvm/CodeGen/MachineInstr.h - MachineInstr class --------*- C++ -*-===//
 //
 // This file contains the declaration of the MachineInstr class, which is the
 // basic representation for all target dependent machine instructions used by
@@ -12,7 +12,6 @@
 #include "llvm/Target/MRegisterInfo.h"
 #include "Support/Annotation.h"
 #include "Support/iterator"
-#include <set>
 
 class Value;
 class Function;
diff --git a/llvm/include/llvm/CodeGen/RegisterAllocation.h b/llvm/include/llvm/CodeGen/RegisterAllocation.h
index 572c3256104..60d0df511ac 100644
--- a/llvm/include/llvm/CodeGen/RegisterAllocation.h
+++ b/llvm/include/llvm/CodeGen/RegisterAllocation.h
@@ -1,4 +1,4 @@
-//===-- CodeGen/RegisterAllocation.h - RegAlloc Pass -------------*- C++ -*--=//
+//===-- CodeGen/RegisterAllocation.h - RegAlloc Pass ------------*- C++ -*-===//
 //
 // This pass register allocates a module, a method at a time.
 //
diff --git a/llvm/include/llvm/CodeGen/SchedGraphCommon.h b/llvm/include/llvm/CodeGen/SchedGraphCommon.h
index 46e49e14ea1..8501448fe22 100644
--- a/llvm/include/llvm/CodeGen/SchedGraphCommon.h
+++ b/llvm/include/llvm/CodeGen/SchedGraphCommon.h
@@ -1,9 +1,9 @@
-//===-- SchedGraphCommon.h - Scheduling Base Graph ---------------*- C++ -*---=//
+//===-- SchedGraphCommon.h - Scheduling Base Graph --------------*- C++ -*-===//
 //
 // A common graph class that is based on the SSA graph. It includes
 // extra dependencies that are caused by machine resources.
 //
-//===-------------------------------------------------------------------------=// 
+//===----------------------------------------------------------------------===//
 
 #ifndef LLVM_CODEGEN_SCHEDGRAPHCOMMON_H
 #define LLVM_CODEGEN_SCHEDGRAPHCOMMON_H
diff --git a/llvm/include/llvm/Constant.h b/llvm/include/llvm/Constant.h
index e6f63b12921..48f1fcce194 100644
--- a/llvm/include/llvm/Constant.h
+++ b/llvm/include/llvm/Constant.h
@@ -1,4 +1,4 @@
-//===-- llvm/Constant.h - Constant class definition --------------*- C++ -*--=//
+//===-- llvm/Constant.h - Constant class definition -------------*- C++ -*-===//
 //
 // This file contains the declaration of the Constant class.
 //
diff --git a/llvm/include/llvm/ConstantHandling.h b/llvm/include/llvm/ConstantHandling.h
index 66719cda8e5..b23566c2095 100644
--- a/llvm/include/llvm/ConstantHandling.h
+++ b/llvm/include/llvm/ConstantHandling.h
@@ -1,4 +1,4 @@
-//===-- ConstantHandling.h - Stuff for manipulating constants ----*- C++ -*--=//
+//===-- ConstantHandling.h - Stuff for manipulating constants ---*- C++ -*-===//
 //
 // This file contains the declarations of some cool operators that allow you
 // to do natural things with constant pool values.
diff --git a/llvm/include/llvm/Constants.h b/llvm/include/llvm/Constants.h
index f36e28bd44b..dc6922e6383 100644
--- a/llvm/include/llvm/Constants.h
+++ b/llvm/include/llvm/Constants.h
@@ -1,4 +1,4 @@
-//===-- llvm/Constants.h - Constant class subclass definitions ---*- C++ -*--=//
+//===-- llvm/Constants.h - Constant class subclass definitions --*- C++ -*-===//
 //
 // This file contains the declarations for the subclasses of Constant, which
 // represent the different type of constant pool values
diff --git a/llvm/include/llvm/DerivedTypes.h b/llvm/include/llvm/DerivedTypes.h
index 39a87b80d36..f65a2ce1c5a 100644
--- a/llvm/include/llvm/DerivedTypes.h
+++ b/llvm/include/llvm/DerivedTypes.h
@@ -1,4 +1,4 @@
-//===-- llvm/DerivedTypes.h - Classes for handling data types ----*- C++ -*--=//
+//===-- llvm/DerivedTypes.h - Classes for handling data types ---*- C++ -*-===//
 //
 // This file contains the declarations of classes that represent "derived 
 // types".  These are things like "arrays of x" or "structure of x, y, z" or
diff --git a/llvm/include/llvm/GlobalValue.h b/llvm/include/llvm/GlobalValue.h
index 13ad9237182..a80e1fe095a 100644
--- a/llvm/include/llvm/GlobalValue.h
+++ b/llvm/include/llvm/GlobalValue.h
@@ -1,4 +1,4 @@
-//===-- llvm/GlobalValue.h - Class to represent a global value ---*- C++ -*--=//
+//===-- llvm/GlobalValue.h - Class to represent a global value --*- C++ -*-===//
 //
 // This file is a common base class of all globally definable objects.  As such,
 // it is subclassed by GlobalVariable and by Function.  This is used because you
diff --git a/llvm/include/llvm/GlobalVariable.h b/llvm/include/llvm/GlobalVariable.h
index 1fd004cb809..064d3ef6d00 100644
--- a/llvm/include/llvm/GlobalVariable.h
+++ b/llvm/include/llvm/GlobalVariable.h
@@ -1,4 +1,4 @@
-//===-- llvm/Global.h - Class to represent a global variable -----*- C++ -*--=//
+//===-- llvm/Global.h - Class to represent a global variable ----*- C++ -*-===//
 //
 // This file contains the declaration of the GlobalVariable class, which
 // represents a single global variable (or constant) in the VM.
diff --git a/llvm/include/llvm/InstrTypes.h b/llvm/include/llvm/InstrTypes.h
index 931ae41a98e..4c6f1441e3f 100644
--- a/llvm/include/llvm/InstrTypes.h
+++ b/llvm/include/llvm/InstrTypes.h
@@ -1,4 +1,4 @@
-//===-- llvm/InstrTypes.h - Important Instruction subclasses -----*- C++ -*--=//
+//===-- llvm/InstrTypes.h - Important Instruction subclasses ----*- C++ -*-===//
 //
 // This file defines various meta classes of instructions that exist in the VM
 // representation.  Specific concrete subclasses of these may be found in the 
diff --git a/llvm/include/llvm/Instruction.def b/llvm/include/llvm/Instruction.def
index 3b3858ad166..ea3b71d53c8 100644
--- a/llvm/include/llvm/Instruction.def
+++ b/llvm/include/llvm/Instruction.def
@@ -1,4 +1,4 @@
-//===-- llvm/Instruction.def - File that describes Instructions --*- C++ -*--=//
+//===-- llvm/Instruction.def - File that describes Instructions -*- C++ -*-===//
 //
 // This file contains descriptions of the various LLVM instructions.  This is
 // used as a central place for enumerating the different instructions and 
diff --git a/llvm/include/llvm/Module.h b/llvm/include/llvm/Module.h
index 4afcc4bd0fa..b27a0120952 100644
--- a/llvm/include/llvm/Module.h
+++ b/llvm/include/llvm/Module.h
@@ -1,4 +1,4 @@
-//===-- llvm/Module.h - C++ class to represent a VM module -------*- C++ -*--=//
+//===-- llvm/Module.h - C++ class to represent a VM module ------*- C++ -*-===//
 //
 // This file contains the declarations for the Module class that is used to 
 // maintain all the information related to a VM module.
diff --git a/llvm/include/llvm/Pass.h b/llvm/include/llvm/Pass.h
index 9e43b5e0a3a..637d26bf554 100644
--- a/llvm/include/llvm/Pass.h
+++ b/llvm/include/llvm/Pass.h
@@ -1,4 +1,4 @@
-//===- llvm/Pass.h - Base class for XForm Passes -----------------*- C++ -*--=//
+//===- llvm/Pass.h - Base class for Passes ----------------------*- C++ -*-===//
 //
 // This file defines a base class that indicates that a specified class is a
 // transformation pass implementation.
diff --git a/llvm/include/llvm/PassAnalysisSupport.h b/llvm/include/llvm/PassAnalysisSupport.h
index d27d6696497..7355e85def0 100644
--- a/llvm/include/llvm/PassAnalysisSupport.h
+++ b/llvm/include/llvm/PassAnalysisSupport.h
@@ -1,4 +1,4 @@
-//===- llvm/PassAnalysisSupport.h - Analysis Pass Support code ---*- C++ -*-==//
+//===- llvm/PassAnalysisSupport.h - Analysis Pass Support code --*- C++ -*-===//
 //
 // This file defines stuff that is used to define and "use" Analysis Passes.
 // This file is automatically #included by Pass.h, so:
diff --git a/llvm/include/llvm/PassManager.h b/llvm/include/llvm/PassManager.h
index c30164b5402..367809e5cce 100644
--- a/llvm/include/llvm/PassManager.h
+++ b/llvm/include/llvm/PassManager.h
@@ -1,4 +1,4 @@
-//===- llvm/PassManager.h - Container for Passes -----------------*- C++ -*--=//
+//===- llvm/PassManager.h - Container for Passes ----------------*- C++ -*-===//
 //
 // This file defines the PassManager class.  This class is used to hold,
 // maintain, and optimize execution of Passes.  The PassManager class ensures
diff --git a/llvm/include/llvm/SlotCalculator.h b/llvm/include/llvm/SlotCalculator.h
index 91006d70175..9d88a0264f1 100644
--- a/llvm/include/llvm/SlotCalculator.h
+++ b/llvm/include/llvm/SlotCalculator.h
@@ -1,4 +1,4 @@
-//===-- llvm/SlotCalculator.h - Calculate value slots ------------*- C++ -*-==//
+//===-- llvm/SlotCalculator.h - Calculate value slots -----------*- C++ -*-===//
 //
 // This class calculates the slots that values will land in.  This is useful for
 // when writing bytecode or assembly out, because you have to know these things.
diff --git a/llvm/include/llvm/Support/CFG.h b/llvm/include/llvm/Support/CFG.h
index 6a3abd92603..2d67c026eb5 100644
--- a/llvm/include/llvm/Support/CFG.h
+++ b/llvm/include/llvm/Support/CFG.h
@@ -1,12 +1,12 @@
-//===-- llvm/Support/CFG.h - Process LLVM structures as graphs ---*- C++ -*--=//
+//===-- llvm/Support/CFG.h - Process LLVM structures as graphs --*- C++ -*-===//
 //
 // This file defines specializations of GraphTraits that allow Function and
 // BasicBlock graphs to be treated as proper graphs for generic algorithms.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CFG_H
-#define LLVM_CFG_H
+#ifndef LLVM_SUPPORT_CFG_H
+#define LLVM_SUPPORT_CFG_H
 
 #include "Support/GraphTraits.h"
 #include "llvm/Function.h"
diff --git a/llvm/include/llvm/Support/InstIterator.h b/llvm/include/llvm/Support/InstIterator.h
index 06fc9bd2818..1f6862ba916 100644
--- a/llvm/include/llvm/Support/InstIterator.h
+++ b/llvm/include/llvm/Support/InstIterator.h
@@ -1,4 +1,4 @@
-//===-- llvm/Support/InstIterator.h - Classes for inst iteration -*- C++ -*--=//
+//===- llvm/Support/InstIterator.h - Classes for inst iteration -*- C++ -*-===//
 //
 // This file contains definitions of two iterators for iterating over the
 // instructions in a function.  This is effectively a wrapper around a two level
diff --git a/llvm/include/llvm/Support/InstVisitor.h b/llvm/include/llvm/Support/InstVisitor.h
index 758cc99064b..9934522f456 100644
--- a/llvm/include/llvm/Support/InstVisitor.h
+++ b/llvm/include/llvm/Support/InstVisitor.h
@@ -1,4 +1,4 @@
-//===- llvm/Support/InstVisitor.h - Define instruction visitors --*- C++ -*--=//
+//===- llvm/Support/InstVisitor.h - Define instruction visitors -*- C++ -*-===//
 //
 // This template class is used to define instruction visitors in a typesafe
 // manner without having to use lots of casts and a big switch statement (in
diff --git a/llvm/include/llvm/Support/Mangler.h b/llvm/include/llvm/Support/Mangler.h
index 15ec2f49fc4..7e44827a476 100644
--- a/llvm/include/llvm/Support/Mangler.h
+++ b/llvm/include/llvm/Support/Mangler.h
@@ -1,4 +1,4 @@
-//===-- Mangler.h - Self-contained c/asm llvm name mangler -*- C++ -*- ----===//
+//===-- Mangler.h - Self-contained c/asm llvm name mangler ------*- C++ -*-===//
 //
 // Unified name mangler for CWriter and assembly backends.
 //
diff --git a/llvm/include/llvm/SymbolTable.h b/llvm/include/llvm/SymbolTable.h
index d020ecbb778..30dc14fb7f9 100644
--- a/llvm/include/llvm/SymbolTable.h
+++ b/llvm/include/llvm/SymbolTable.h
@@ -1,4 +1,4 @@
-//===-- llvm/SymbolTable.h - Implement a type plane'd symtab ------*- C++ -*-=//
+//===-- llvm/SymbolTable.h - Implement a type plane'd symtab ----*- C++ -*-===//
 //
 // This file implements a symbol table that has planed broken up by type.  
 // Identical types may have overlapping symbol names as long as they are 
diff --git a/llvm/include/llvm/SymbolTableListTraits.h b/llvm/include/llvm/SymbolTableListTraits.h
index 74aede11a3e..633fe6d821f 100644
--- a/llvm/include/llvm/SymbolTableListTraits.h
+++ b/llvm/include/llvm/SymbolTableListTraits.h
@@ -1,4 +1,4 @@
-//===-- llvm/SymbolTableListTraits.h - Traits for iplist -------*- C++ -*--===//
+//===-- llvm/SymbolTableListTraits.h - Traits for iplist --------*- C++ -*-===//
 //
 // This file defines a generic class that is used to implement the automatic
 // symbol table manipulation that occurs when you put (for example) a named
diff --git a/llvm/include/llvm/Target/TargetData.h b/llvm/include/llvm/Target/TargetData.h
index 11d078c2326..ae7780dc3a2 100644
--- a/llvm/include/llvm/Target/TargetData.h
+++ b/llvm/include/llvm/Target/TargetData.h
@@ -1,4 +1,4 @@
-//===-- llvm/Target/TargetData.h - Data size & alignment routines-*- C++ -*-==//
+//===-- llvm/Target/TargetData.h - Data size & alignment info ---*- C++ -*-===//
 //
 // This file defines target properties related to datatype size/offset/alignment
 // information.  It uses lazy annotations to cache information about how 
diff --git a/llvm/include/llvm/Target/TargetMachine.h b/llvm/include/llvm/Target/TargetMachine.h
index 0772c13755f..447355e240a 100644
--- a/llvm/include/llvm/Target/TargetMachine.h
+++ b/llvm/include/llvm/Target/TargetMachine.h
@@ -1,4 +1,4 @@
-//===-- llvm/Target/TargetMachine.h - General Target Information -*- C++ -*-==//
+//===-- llvm/Target/TargetMachine.h - Target Information --------*- C++ -*-===//
 //
 // This file describes the general parts of a Target machine.
 //
diff --git a/llvm/include/llvm/Target/TargetRegInfo.h b/llvm/include/llvm/Target/TargetRegInfo.h
index 44ba3e06f2d..51d11c2a6ef 100644
--- a/llvm/include/llvm/Target/TargetRegInfo.h
+++ b/llvm/include/llvm/Target/TargetRegInfo.h
@@ -1,4 +1,4 @@
-//===-- llvm/Target/TargetRegInfo.h - Target Register Info -------*- C++ -*-==//
+//===-- llvm/Target/TargetRegInfo.h - Target Register Info ------*- C++ -*-===//
 //
 // This file is used to describe the register system of a target to the
 // register allocator.
diff --git a/llvm/include/llvm/Target/TargetSchedInfo.h b/llvm/include/llvm/Target/TargetSchedInfo.h
index 5d42d40bcbd..9c9da1d0839 100644
--- a/llvm/include/llvm/Target/TargetSchedInfo.h
+++ b/llvm/include/llvm/Target/TargetSchedInfo.h
@@ -1,4 +1,4 @@
-//===- Target/TargetSchedInfo.h - Target Instruction Sched Info --*- C++ -*-==//
+//===- Target/TargetSchedInfo.h - Target Instruction Sched Info -*- C++ -*-===//
 //
 // This file describes the target machine to the instruction scheduler.
 //
diff --git a/llvm/include/llvm/Transforms/MutateStructTypes.h b/llvm/include/llvm/Transforms/MutateStructTypes.h
index 26da666c4a0..1597ac9a105 100644
--- a/llvm/include/llvm/Transforms/MutateStructTypes.h
+++ b/llvm/include/llvm/Transforms/MutateStructTypes.h
@@ -1,4 +1,4 @@
-//===- llvm/Transforms/MutateStructTypes.h - Change struct defns -*- C++ -*--=//
+//===-- llvm/Transforms/MutateStructTypes.h - Rearrange structs -*- C++ -*-===//
 //
 // This pass is used to change structure accesses and type definitions in some
 // way.  It can be used to arbitrarily permute structure fields, safely, without
diff --git a/llvm/include/llvm/Transforms/Scalar.h b/llvm/include/llvm/Transforms/Scalar.h
index 796d57b578a..1c9a1299c0c 100644
--- a/llvm/include/llvm/Transforms/Scalar.h
+++ b/llvm/include/llvm/Transforms/Scalar.h
@@ -1,4 +1,4 @@
-//===-- Scalar.h - Scalar Transformations ------------------------*- C++ -*-==//
+//===-- Scalar.h - Scalar Transformations -----------------------*- C++ -*-===//
 //
 // This header file defines prototypes for accessor functions that expose passes
 // in the Scalar transformations library.
diff --git a/llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h b/llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h
index 3e8edcec1a0..680ce41a5ee 100644
--- a/llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h
+++ b/llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h
@@ -1,4 +1,4 @@
-//===-- Transform/Utils/BasicBlockUtils.h - BasicBlock Utilities -*- C++ -*-==//
+//===-- Transform/Utils/BasicBlockUtils.h - BasicBlock Utils ----*- C++ -*-===//
 //
 // This family of functions perform manipulations on basic blocks, and
 // instructions contained within basic blocks.
diff --git a/llvm/include/llvm/Transforms/Utils/Linker.h b/llvm/include/llvm/Transforms/Utils/Linker.h
index dac0f9b90e7..f40cce3dcd1 100644
--- a/llvm/include/llvm/Transforms/Utils/Linker.h
+++ b/llvm/include/llvm/Transforms/Utils/Linker.h
@@ -1,4 +1,4 @@
-//===- llvm/Transforms/Utils/Linker.h - Module Linker Interface --*- C++ -*--=//
+//===- llvm/Transforms/Utils/Linker.h - Module Linker Interface -*- C++ -*-===//
 //
 // This file defines the interface to the module linker.
 //
diff --git a/llvm/include/llvm/Transforms/Utils/Local.h b/llvm/include/llvm/Transforms/Utils/Local.h
index 86cabec7958..ac51bca1da5 100644
--- a/llvm/include/llvm/Transforms/Utils/Local.h
+++ b/llvm/include/llvm/Transforms/Utils/Local.h
@@ -1,4 +1,4 @@
-//===-- Local.h - Functions to perform local transformations -----*- C++ -*--=//
+//===-- Local.h - Functions to perform local transformations ----*- C++ -*-===//
 //
 // This family of functions perform various local transformations to the
 // program.
diff --git a/llvm/include/llvm/Type.def b/llvm/include/llvm/Type.def
index c56da22b763..e271f10f7e3 100644
--- a/llvm/include/llvm/Type.def
+++ b/llvm/include/llvm/Type.def
@@ -1,4 +1,4 @@
-//===-- llvm/Type.def - File that describes various LLVM types ---*- C++ -*--=//
+//===-- llvm/Type.def - File that describes various LLVM types --*- C++ -*-===//
 //
 // This file contains descriptions of the various LLVM types and derived types.
 // This file serves as a source of in source documentation and a can be
diff --git a/llvm/include/llvm/Type.h b/llvm/include/llvm/Type.h
index b72bcf97ba8..30949a64577 100644
--- a/llvm/include/llvm/Type.h
+++ b/llvm/include/llvm/Type.h
@@ -1,4 +1,4 @@
-//===-- llvm/Type.h - Classes for handling data types ------------*- C++ -*--=//
+//===-- llvm/Type.h - Classes for handling data types -----------*- C++ -*-===//
 //
 // This file contains the declaration of the Type class.  For more "Type" type
 // stuff, look in DerivedTypes.h.
@@ -37,8 +37,7 @@ class PointerType;
 class StructType;
 class OpaqueType;
 
-class Type : public Value {
-public:
+struct Type : public Value {
   ///===-------------------------------------------------------------------===//
   /// Definitions of all of the base types for the Type system.  Based on this
   /// value, you can cast to a "DerivedType" subclass (see DerivedTypes.h)
diff --git a/llvm/include/llvm/User.h b/llvm/include/llvm/User.h
index cf0f53c4ad8..aa29f6dae38 100644
--- a/llvm/include/llvm/User.h
+++ b/llvm/include/llvm/User.h
@@ -1,4 +1,4 @@
-//===-- llvm/User.h - User class definition ----------------------*- C++ -*--=//
+//===-- llvm/User.h - User class definition ---------------------*- C++ -*-===//
 //
 // This class defines the interface that one who 'use's a Value must implement.
 // Each instance of the Value class keeps track of what User's have handles
diff --git a/llvm/include/llvm/Value.h b/llvm/include/llvm/Value.h
index 437a380801f..99bc8affa4b 100644
--- a/llvm/include/llvm/Value.h
+++ b/llvm/include/llvm/Value.h
@@ -1,4 +1,4 @@
-//===-- llvm/Value.h - Definition of the Value class -------------*- C++ -*--=//
+//===-- llvm/Value.h - Definition of the Value class ------------*- C++ -*-===//
 //
 // This file defines the very important Value class.  This is subclassed by a
 // bunch of other important classes, like Instruction, Function, Type, etc...
diff --git a/llvm/include/llvm/iOther.h b/llvm/include/llvm/iOther.h
index 45b8db367d8..787483348fb 100644
--- a/llvm/include/llvm/iOther.h
+++ b/llvm/include/llvm/iOther.h
@@ -1,4 +1,4 @@
-//===-- llvm/iOther.h - "Other" instruction node definitions -----*- C++ -*--=//
+//===-- llvm/iOther.h - "Other" instruction node definitions ----*- C++ -*-===//
 //
 // This file contains the declarations for instructions that fall into the 
 // grandiose 'other' catagory...
diff --git a/llvm/include/llvm/iPHINode.h b/llvm/include/llvm/iPHINode.h
index eba5a735542..4dbee257907 100644
--- a/llvm/include/llvm/iPHINode.h
+++ b/llvm/include/llvm/iPHINode.h
@@ -1,4 +1,4 @@
-//===-- llvm/iPHINode.h - PHI instruction definition -------------*- C++ -*--=//
+//===-- llvm/iPHINode.h - PHI instruction definition ------------*- C++ -*-===//
 //
 // This file defines the PHINode class.
 //