diff --git a/lib/Target/PowerPC/PPCInstrBuilder.h b/lib/Target/PowerPC/PPCInstrBuilder.h
index 704e17c49b0..d400acf0df3 100644
--- a/lib/Target/PowerPC/PPCInstrBuilder.h
+++ b/lib/Target/PowerPC/PPCInstrBuilder.h
@@ -1,4 +1,4 @@
-//===-- PowerPCInstrBuilder.h - Functions to aid building PPC insts -*- C++ -*-===//
+//===-- PowerPCInstrBuilder.h - Aides for building PPC insts ----*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,12 +12,13 @@
 // references.
 //
 // For reference, the order of operands for memory references is:
-// (Operand), Dest Reg, Base Reg, and either Reg Index or Immediate Displacement.
+// (Operand), Dest Reg, Base Reg, and either Reg Index or Immediate
+// Displacement.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef PPCINSTRBUILDER_H
-#define PPCINSTRBUILDER_H
+#ifndef POWERPC_INSTRBUILDER_H
+#define POWERPC_INSTRBUILDER_H
 
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 
@@ -28,12 +29,13 @@ namespace llvm {
 /// reference has base register as the FrameIndex offset until it is resolved.
 /// This allows a constant offset to be specified as well...
 ///
-inline const MachineInstrBuilder &
-addFrameReference(const MachineInstrBuilder &MIB, int FI, int Offset = 0, bool mem = true) {
-	if (mem)
-		return MIB.addSImm(Offset).addFrameIndex(FI);
-	else
-		return MIB.addFrameIndex(FI).addSImm(Offset);
+inline const MachineInstrBuilder&
+addFrameReference(const MachineInstrBuilder &MIB, int FI, int Offset = 0, 
+                  bool mem = true) {
+  if (mem)
+    return MIB.addSImm(Offset).addFrameIndex(FI);
+  else
+    return MIB.addFrameIndex(FI).addSImm(Offset);
 }
 
 /// addConstantPoolReference - This function is used to add a reference to the
@@ -42,7 +44,7 @@ addFrameReference(const MachineInstrBuilder &MIB, int FI, int Offset = 0, bool m
 /// either machine code emission or assembly output.  This allows an optional
 /// offset to be added as well.
 ///
-inline const MachineInstrBuilder &
+inline const MachineInstrBuilder&
 addConstantPoolReference(const MachineInstrBuilder &MIB, unsigned CPI,
                          int Offset = 0) {
   return MIB.addSImm(Offset).addConstantPoolIndex(CPI);