diff --git a/include/loki/AbstractFactory.h b/include/loki/AbstractFactory.h
index 62d5326..632b274 100644
--- a/include/loki/AbstractFactory.h
+++ b/include/loki/AbstractFactory.h
@@ -159,16 +159,6 @@ namespace Loki
 
 } // namespace Loki
 
-////////////////////////////////////////////////////////////////////////////////
-// Change log:
-// June 20, 2001: ported by Nick Thurn to gcc 2.95.3. Kudos, Nick!!!
-// September 25, 2004: Fixed bug in PrototypeFactoryUnit::GetPrototype, thanks
-//   to a bug report submitted by funcall.
-////////////////////////////////////////////////////////////////////////////////
 
-#endif // ABSTRACTFACTORY_INC_
+#endif // end file guardian
 
-// $Log$
-// Revision 1.4  2006/01/16 19:05:09  rich_sposato
-// Added cvs keywords.
-//
diff --git a/include/loki/AssocVector.h b/include/loki/AssocVector.h
index 4fd90cd..b8d9d9b 100644
--- a/include/loki/AssocVector.h
+++ b/include/loki/AssocVector.h
@@ -322,20 +322,5 @@ namespace Loki
     
 } // namespace Loki
 
-////////////////////////////////////////////////////////////////////////////////
-// Change log:
-// May 20,     2001: change operator= - credit due to Cristoph Koegl
-// June 11,    2001: remove paren in equal_range - credit due to Cristoph Koegl
-// June 20,    2001: ported by Nick Thurn to gcc 2.95.3. Kudos, Nick!!!
-// January 22, 2002: fixed operator= - credit due to Tom Hyer
-// June 25,    2002: fixed template insert() - credit due to Robert Minsk
-// June 27,    2002: fixed member swap() - credit due to David Brookman
-// February 2, 2003: fixed dependent names - credit due to Rani Sharoni
-////////////////////////////////////////////////////////////////////////////////
+#endif // end file guardian
 
-#endif // ASSOCVECTOR_INC_
-
-// $Log$
-// Revision 1.5  2006/01/16 19:05:09  rich_sposato
-// Added cvs keywords.
-//
diff --git a/include/loki/CachedFactory.h b/include/loki/CachedFactory.h
index 04c88b5..f286ee5 100644
--- a/include/loki/CachedFactory.h
+++ b/include/loki/CachedFactory.h
@@ -1056,5 +1056,6 @@ namespace Loki
         }
      };
 } // namespace Loki
-	 
-#endif /*_CACHEDFACTORY_H_*/
+
+#endif // end file guardian
+
diff --git a/include/loki/ConstPolicy.h b/include/loki/ConstPolicy.h
index 1ed574b..c944016 100644
--- a/include/loki/ConstPolicy.h
+++ b/include/loki/ConstPolicy.h
@@ -60,8 +60,3 @@ namespace Loki
 } // end namespace Loki
 
 #endif // end file guardian
-
-// $Log$
-// Revision 1.1  2006/02/19 22:04:28  rich_sposato
-// Moved Const-policy structs from SmartPtr.h to ConstPolicy.h.
-//
diff --git a/include/loki/DataGenerators.h b/include/loki/DataGenerators.h
index da8ffa9..1da3c05 100644
--- a/include/loki/DataGenerators.h
+++ b/include/loki/DataGenerators.h
@@ -111,14 +111,5 @@ namespace Loki
     }//ns TL
 }//ns Loki
 
-#endif //DATAGENERATORS_H
-////////////////////////////////////////////////////////////////////////////////
-// Change log:
-// 9/20/02 Named changed from GenData to IterateTypes
-// 10/8/02 insertion iterators are passed-by-value, not by-reference (oops)
-////////////////////////////////////////////////////////////////////////////////
+#endif // end file guardian
 
-// $Log$
-// Revision 1.4  2006/01/16 19:05:09  rich_sposato
-// Added cvs keywords.
-//
diff --git a/include/loki/EmptyType.h b/include/loki/EmptyType.h
index ac82ec1..2b8dad3 100644
--- a/include/loki/EmptyType.h
+++ b/include/loki/EmptyType.h
@@ -47,20 +47,5 @@ namespace Loki
     }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// Change log:
-// June 20, 2001: ported by Nick Thurn to gcc 2.95.3. Kudos, Nick!!!
-////////////////////////////////////////////////////////////////////////////////
+#endif // end file guardian
 
-#endif // EMPTYTYPE_INC_
-
-// $Log$
-// Revision 1.5  2006/10/16 11:16:59  syntheticpp
-// add inline to fix linker errors
-//
-// Revision 1.4  2006/10/16 10:38:02  syntheticpp
-// add operator > < == to EmptyType
-//
-// Revision 1.3  2006/01/16 19:05:09  rich_sposato
-// Added cvs keywords.
-//
diff --git a/include/loki/HierarchyGenerators.h b/include/loki/HierarchyGenerators.h
index 0d5018a..2d08daa 100644
--- a/include/loki/HierarchyGenerators.h
+++ b/include/loki/HierarchyGenerators.h
@@ -287,17 +287,5 @@ namespace Loki
 #endif
 }   // namespace Loki
 
-////////////////////////////////////////////////////////////////////////////////
-// Change log:
-// June 20, 2001: ported by Nick Thurn to gcc 2.95.3. Kudos, Nick!!!
-// September 16, 2002: Fixed dependent template, using "::template" syntax. T.S.
-//
-// $Log:
-////////////////////////////////////////////////////////////////////////////////
+#endif // end file guardian
 
-#endif // HIERARCHYGENERATORS_INC_
-
-// $Log$
-// Revision 1.5  2006/01/16 19:05:09  rich_sposato
-// Added cvs keywords.
-//
diff --git a/include/loki/Key.h b/include/loki/Key.h
index 36fbffa..46e8d16 100644
--- a/include/loki/Key.h
+++ b/include/loki/Key.h
@@ -758,4 +758,5 @@ namespace Loki
 
 } // namespace Loki
 
-#endif /*_KEY_H_*/
+#endif // end file guardian
+
diff --git a/include/loki/MultiMethods.h b/include/loki/MultiMethods.h
index 0d91f7d..e653d9d 100644
--- a/include/loki/MultiMethods.h
+++ b/include/loki/MultiMethods.h
@@ -409,15 +409,7 @@ namespace Loki
     };
 } // namespace Loki
 
-////////////////////////////////////////////////////////////////////////////////
-// Change log:
-// June 20,    2001: ported by Nick Thurn to gcc 2.95.3. Kudos, Nick!!!
-// February 2, 2003: fixed dependent names - credit due to Rani Sharoni
-////////////////////////////////////////////////////////////////////////////////
 
-#endif
 
-// $Log$
-// Revision 1.4  2006/01/16 19:05:09  rich_sposato
-// Added cvs keywords.
-//
+#endif // end file guardian
+
diff --git a/include/loki/NullType.h b/include/loki/NullType.h
index 8329a75..d8548f5 100644
--- a/include/loki/NullType.h
+++ b/include/loki/NullType.h
@@ -32,15 +32,5 @@ namespace Loki
     
 }   // namespace Loki
 
-////////////////////////////////////////////////////////////////////////////////
-// Change log:
-// June 20, 2001: ported by Nick Thurn to gcc 2.95.3. Kudos, Nick!!!
-// November 22, 2001: minor change to support porting to boost
-////////////////////////////////////////////////////////////////////////////////
 
-#endif // NULLTYPE_INC_
-
-// $Log$
-// Revision 1.3  2006/01/16 19:05:09  rich_sposato
-// Added cvs keywords.
-//
+#endif // end file guardian
diff --git a/include/loki/OrderedStatic.h b/include/loki/OrderedStatic.h
index 03d604d..98bf92e 100644
--- a/include/loki/OrderedStatic.h
+++ b/include/loki/OrderedStatic.h
@@ -222,12 +222,5 @@ namespace Loki
 }// namespace Loki
 
 
-#endif
+#endif // end file guardian
 
-// $Log$
-// Revision 1.10  2006/02/27 19:59:20  syntheticpp
-// add support of loki.dll
-//
-// Revision 1.9  2006/01/16 19:05:09  rich_sposato
-// Added cvs keywords.
-//
diff --git a/include/loki/Pimpl.h b/include/loki/Pimpl.h
index d48a20e..a19244a 100644
--- a/include/loki/Pimpl.h
+++ b/include/loki/Pimpl.h
@@ -193,57 +193,5 @@ namespace Loki
   
 }
 
-#endif
+#endif // end file guardian
 
-// $Log$
-// Revision 1.22  2006/07/17 11:05:44  syntheticpp
-// ImplT/PimplT/RimplT renamed to the more readable version: T->Of
-//
-// Revision 1.21  2006/06/19 12:39:08  syntheticpp
-// replace tabs with 4 spaces
-//
-// Revision 1.20  2006/03/27 15:33:24  syntheticpp
-// fix spelling
-//
-// Revision 1.19  2006/03/08 17:07:11  syntheticpp
-// replace tabs with 4 spaces in all files
-//
-// Revision 1.18  2006/03/08 16:39:27  syntheticpp
-// add documenation
-//
-// Revision 1.17  2006/03/02 09:55:37  syntheticpp
-// don't compile with incomplete types
-//
-// Revision 1.16  2006/03/01 15:20:19  syntheticpp
-// add documenation how to avoid the -deletion of pointer to incomplete type- error
-//
-// Revision 1.15  2006/01/28 20:12:56  syntheticpp
-// replace implementation with a auto-create and propagating-const wrapper for smart pointers which auto delete the holded pointer on destruction
-//
-// Revision 1.14  2006/01/26 14:28:59  syntheticpp
-// remove wrong 'typename'
-//
-// Revision 1.13  2006/01/23 17:22:49  syntheticpp
-// add support of deep constness, only supported by (future) Loki::SmartPtr, not supported by boost::shared_ptr and plain pointer. Maybe deep constness forces a redesign of Pimpl. Is there a way to support deep constness by a rimpl?
-//
-// Revision 1.12  2006/01/19 18:16:39  syntheticpp
-// disable usage with auto_ptr: don't compile with std::auto_ptr
-//
-// Revision 1.11  2006/01/18 19:03:06  syntheticpp
-// make rimpl type really a reference
-//
-// Revision 1.10  2006/01/18 16:49:06  syntheticpp
-// move definition of the destructor to extra file, because msvc tries to use the incomplete type; not inlining does not help; maybe this is a compiler bug.
-//
-// Revision 1.9  2006/01/17 12:03:36  syntheticpp
-// add comment about auto_ptr
-//
-// Revision 1.8  2006/01/17 11:07:34  syntheticpp
-// AutoPtrHolderChecked inherits from AutoPtrHolder
-//
-// Revision 1.7  2006/01/16 19:48:23  syntheticpp
-// add error policy
-//
-// Revision 1.6  2006/01/16 19:05:09  rich_sposato
-// Added cvs keywords.
-//
diff --git a/include/loki/RefToValue.h b/include/loki/RefToValue.h
index 1670aa5..837b513 100644
--- a/include/loki/RefToValue.h
+++ b/include/loki/RefToValue.h
@@ -63,6 +63,5 @@ namespace Loki
 }
 
 
-
-#endif //LOKI_REFTOVALUE_H
+#endif // end file guardian
 
diff --git a/include/loki/Register.h b/include/loki/Register.h
index f621c4f..af177cf 100644
--- a/include/loki/Register.h
+++ b/include/loki/Register.h
@@ -118,5 +118,5 @@ namespace Loki
 } // namespace Loki
 
 
-#endif
+#endif // end file guardian
 
diff --git a/include/loki/Visitor.h b/include/loki/Visitor.h
index 0ddf48e..d5dda06 100644
--- a/include/loki/Visitor.h
+++ b/include/loki/Visitor.h
@@ -349,17 +349,7 @@ struct DefaultCatchAll
 
 } // namespace Loki
 
-////////////////////////////////////////////////////////////////////////////////
-// Change log:
-// March     20, ????: add default argument DefaultCatchAll to BaseVisitable
-// June      20, 2001: ported by Nick Thurn to gcc 2.95.3. Kudos, Nick!!!
-// September 28, 2004: replaced Loki:: with ::Loki:: in DEFINE_VISITABLE
-// January    2, 2006: add support for visiting constant member functions, Peter Kümmel
-////////////////////////////////////////////////////////////////////////////////
 
-#endif // VISITOR_INC_
 
-// $Log$
-// Revision 1.7  2006/01/16 19:05:09  rich_sposato
-// Added cvs keywords.
-//
+#endif // end file guardian
+
diff --git a/include/loki/readme.txt b/include/loki/readme.txt
index 0e93cc3..5cf4d3c 100644
--- a/include/loki/readme.txt
+++ b/include/loki/readme.txt
@@ -1,8 +1,12 @@
+// $Id$
+
 The Golden Code
 KEEPEN DER DAMDDEN FUGGERMUTTENS OTTEN DIS CODDEN FIL
 
 A compliant C++ compiler will compile all of this code as is.
 See the respective vendor directories for code that actually compiles & runs.
 
-Note: Right now, this code contains CodeWarrior & gcc modifications, which may be removed at a future point in time (by moving them to a vendor specific implementation).
+Note: Right now, this code contains CodeWarrior & gcc modifications, 
+which may be removed at a future point in time 
+(by moving them to a vendor specific implementation).
 MKH
\ No newline at end of file
diff --git a/include/loki/static_check.h b/include/loki/static_check.h
index e0f6a18..45ef291 100644
--- a/include/loki/static_check.h
+++ b/include/loki/static_check.h
@@ -43,16 +43,5 @@ namespace Loki
     { Loki::CompileTimeError<((expr) != 0)> ERROR_##msg; (void)ERROR_##msg; } 
 
 
-////////////////////////////////////////////////////////////////////////////////
-// Change log:
-// March 20, 2001: add extra parens to STATIC_CHECK - it looked like a fun 
-//     definition
-// June 20, 2001: ported by Nick Thurn to gcc 2.95.3. Kudos, Nick!!!
-////////////////////////////////////////////////////////////////////////////////
+#endif // end file guardian
 
-#endif // STATIC_CHECK_INC_
-
-// $Log$
-// Revision 1.3  2006/01/16 19:05:09  rich_sposato
-// Added cvs keywords.
-//