diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx
index 0a63dd38b..3bc9d0c3a 100644
--- a/Source/CPack/cmCPackOSXX11Generator.cxx
+++ b/Source/CPack/cmCPackOSXX11Generator.cxx
@@ -114,8 +114,9 @@ int cmCPackOSXX11Generator::CompressFiles(const char* outFileName,
   cmSystemTools::CreateSymlink("/Applications", applicationsLinkName.c_str());
 
   if (
-    !this->CopyResourcePlistFile("VolumeIcon.icns", diskImageDirectory.c_str(),
-      ".VolumeIcon.icns", true ) ||
+    !this->CopyResourcePlistFile("VolumeIcon.icns", 
+                                 diskImageDirectory.c_str(),
+                                 ".VolumeIcon.icns", true ) ||
     !this->CopyResourcePlistFile("DS_Store", diskImageDirectory.c_str(),
       ".DS_Store", true ) ||
     !this->CopyResourcePlistFile("background.png",
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 3e07a24b3..4ab899ab2 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2404,7 +2404,8 @@ cmLocalGenerator::GetTargetObjectFileDirectories(cmTarget* ,
                                                  std::vector<std::string>& 
                                                  )
 {
-  cmSystemTools::Error("GetTargetObjectFileDirectories called on cmLocalGenerator");
+  cmSystemTools::Error("GetTargetObjectFileDirectories"
+                       " called on cmLocalGenerator");
 }
 
 std::string cmLocalGenerator::GetSourceObjectName(cmSourceFile& sf)
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index ff7215209..b69d9bb5c 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1965,7 +1965,8 @@ GetTargetObjectFileDirectories(cmTarget* target,
 
   
   // return the source name for the object file
-std::string cmLocalVisualStudio7Generator::GetSourceObjectName(cmSourceFile& sf )
+std::string 
+cmLocalVisualStudio7Generator::GetSourceObjectName(cmSourceFile& sf )
 {
   std::string ret = sf.GetSourceName();
   std::string::size_type pos = ret.find("/");
diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index 311735db7..c55a0edbb 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -18,7 +18,8 @@ GetTargetObjectFileDirectories(cmTarget* target,
                                std::vector<std::string>& 
                                dirs)
 {
-  cmGlobalXCodeGenerator* g = (cmGlobalXCodeGenerator*)this->GetGlobalGenerator();
+  cmGlobalXCodeGenerator* g = 
+    (cmGlobalXCodeGenerator*)this->GetGlobalGenerator();
   g->SetCurrentLocalGenerator(this);
   g->GetTargetObjectFileDirectories(target,
                                     dirs);
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 5349dff03..3bd0d301a 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1195,7 +1195,8 @@ void cmTarget::ComputeObjectFiles()
       {
       cmSourceFile* sf = *s;
       const char* lang = this->Makefile->GetLocalGenerator()->
-        GetGlobalGenerator()->GetLanguageFromExtension(sf->GetSourceExtension().c_str());
+        GetGlobalGenerator()->
+        GetLanguageFromExtension(sf->GetSourceExtension().c_str());
       std::string lookupObj = objExtensionLookup1 + lang;
       lookupObj += objExtensionLookup2;
       const char* obj = this->Makefile->GetDefinition(lookupObj.c_str());