diff --git a/include/loki/AbstractFactory.h b/include/loki/AbstractFactory.h
index 632b274..2e79836 100644
--- a/include/loki/AbstractFactory.h
+++ b/include/loki/AbstractFactory.h
@@ -12,13 +12,11 @@
 //     suitability of this software for any purpose. It is provided "as is" 
 //     without express or implied warranty.
 ////////////////////////////////////////////////////////////////////////////////
-
-// Last update: June 20, 2001
-
 #ifndef LOKI_ABSTRACTFACTORY_INC_
 #define LOKI_ABSTRACTFACTORY_INC_
 
-// $Header$
+// $Id$
+
 
 #include "Typelist.h"
 #include "Sequence.h"
diff --git a/include/loki/AssocVector.h b/include/loki/AssocVector.h
index b8d9d9b..0609cd4 100644
--- a/include/loki/AssocVector.h
+++ b/include/loki/AssocVector.h
@@ -12,11 +12,11 @@
 //     suitability of this software for any purpose. It is provided "as is" 
 //     without express or implied warranty.
 ////////////////////////////////////////////////////////////////////////////////
-
 #ifndef LOKI_ASSOCVECTOR_INC_
 #define LOKI_ASSOCVECTOR_INC_
 
-// $Header$
+// $Id$
+
 
 #include <algorithm>
 #include <functional>
diff --git a/include/loki/CachedFactory.h b/include/loki/CachedFactory.h
index f286ee5..55ea039 100644
--- a/include/loki/CachedFactory.h
+++ b/include/loki/CachedFactory.h
@@ -17,9 +17,11 @@
 //     Patterns Applied". Copyright (c) 2001. Addison-Wesley.
 //
 ////////////////////////////////////////////////////////////////////////////////
+#ifndef LOKI_CACHEDFACTORY_INC_
+#define LOKI_CACHEDFACTORY_INC_
+
+// $Id$
 
-#ifndef LOKI_CACHEDFACTORY_H_
-#define LOKI_CACHEDFACTORY_H_
 
 #include <vector>
 #include <iterator>
diff --git a/include/loki/ConstPolicy.h b/include/loki/ConstPolicy.h
index c944016..b5e2383 100644
--- a/include/loki/ConstPolicy.h
+++ b/include/loki/ConstPolicy.h
@@ -10,11 +10,10 @@
 //     suitability of this software for any purpose. It is provided "as is" 
 //     without express or implied warranty.
 ////////////////////////////////////////////////////////////////////////////////
-
 #ifndef LOKI_CONST_POLICY_INC_
 #define LOKI_CONST_POLICY_INC_
 
-// $Header$
+// $Id$
 
 
 namespace Loki
diff --git a/include/loki/DataGenerators.h b/include/loki/DataGenerators.h
index 1da3c05..9839676 100644
--- a/include/loki/DataGenerators.h
+++ b/include/loki/DataGenerators.h
@@ -9,13 +9,11 @@
 // The author makes no representations about the suitability of this software
 //  for any purpose. It is provided "as is" without express or implied warranty.
 ////////////////////////////////////////////////////////////////////////////////
+#ifndef LOKI_DATAGENERATORS_INC_
+#define LOKI_DATAGENERATORS_INC_
 
-// Last update: Oct 10, 2002
+// $Id$
 
-#ifndef LOKI_DATAGENERATORS_H
-#define LOKI_DATAGENERATORS_H
-
-// $Header$
 
 #include "Typelist.h"
 
diff --git a/include/loki/EmptyType.h b/include/loki/EmptyType.h
index 2b8dad3..9ca740b 100644
--- a/include/loki/EmptyType.h
+++ b/include/loki/EmptyType.h
@@ -12,13 +12,11 @@
 //     suitability of this software for any purpose. It is provided "as is" 
 //     without express or implied warranty.
 ////////////////////////////////////////////////////////////////////////////////
-
-// Last update: June 20, 2001
-
 #ifndef LOKI_EMPTYTYPE_INC_
 #define LOKI_EMPTYTYPE_INC_
 
-// $Header$
+// $Id$
+
 
 namespace Loki
 {
diff --git a/include/loki/HierarchyGenerators.h b/include/loki/HierarchyGenerators.h
index 2d08daa..7bf1229 100644
--- a/include/loki/HierarchyGenerators.h
+++ b/include/loki/HierarchyGenerators.h
@@ -12,11 +12,11 @@
 //     suitability of this software for any purpose. It is provided "as is" 
 //     without express or implied warranty.
 ////////////////////////////////////////////////////////////////////////////////
-
 #ifndef LOKI_HIERARCHYGENERATORS_INC_
 #define LOKI_HIERARCHYGENERATORS_INC_
 
-// $Header$
+// $Id$
+
 
 #include "Typelist.h"
 #include "TypeTraits.h"
diff --git a/include/loki/Key.h b/include/loki/Key.h
index 46e8d16..d6f4c4e 100644
--- a/include/loki/Key.h
+++ b/include/loki/Key.h
@@ -17,9 +17,11 @@
 //     Patterns Applied". Copyright (c) 2001. Addison-Wesley.
 //
 ////////////////////////////////////////////////////////////////////////////////
+#ifndef LOKI_KEY_INC_
+#define LOKI_KEY_INC_
+
+// $Id$
 
-#ifndef LOKI_KEY_H_
-#define LOKI_KEY_H_
 
 #include <loki/Factory.h>
 
diff --git a/include/loki/MultiMethods.h b/include/loki/MultiMethods.h
index e653d9d..303f817 100644
--- a/include/loki/MultiMethods.h
+++ b/include/loki/MultiMethods.h
@@ -12,11 +12,11 @@
 //     suitability of this software for any purpose. It is provided "as is" 
 //     without express or implied warranty.
 ////////////////////////////////////////////////////////////////////////////////
-
 #ifndef LOKI_MULTIMETHODS_INC_
 #define LOKI_MULTIMETHODS_INC_
 
-// $Header$
+// $Id$
+
 
 #include "Typelist.h"
 #include "LokiTypeInfo.h"
diff --git a/include/loki/NullType.h b/include/loki/NullType.h
index d8548f5..16da7e6 100644
--- a/include/loki/NullType.h
+++ b/include/loki/NullType.h
@@ -12,13 +12,11 @@
 //     suitability of this software for any purpose. It is provided "as is" 
 //     without express or implied warranty.
 ////////////////////////////////////////////////////////////////////////////////
-
-// Last update: November 22, 2001
-
 #ifndef LOKI_NULLTYPE_INC_
 #define LOKI_NULLTYPE_INC_
 
-// $Header$
+// $Id$
+
 
 namespace Loki
 {
diff --git a/include/loki/OrderedStatic.h b/include/loki/OrderedStatic.h
index 98bf92e..b1b6b15 100644
--- a/include/loki/OrderedStatic.h
+++ b/include/loki/OrderedStatic.h
@@ -9,11 +9,10 @@
 //     suitability of this software for any purpose. It is provided "as is" 
 //     without express or implied warranty.
 ////////////////////////////////////////////////////////////////////////////////
+#ifndef LOKI_ORDEREDSTATIC_INC_
+#define LOKI_ORDEREDSTATIC_INC_
 
-#ifndef LOKI_ORDEREDSTATIC_H_
-#define LOKI_ORDEREDSTATIC_H_
-
-// $Header$
+// $Id$
 
 
 #include <vector>
diff --git a/include/loki/Pimpl.h b/include/loki/Pimpl.h
index a19244a..7d0f77c 100644
--- a/include/loki/Pimpl.h
+++ b/include/loki/Pimpl.h
@@ -9,10 +9,11 @@
 //     suitability of this software for any purpose. It is provided "as is" 
 //     without express or implied warranty.
 ////////////////////////////////////////////////////////////////////////////////
-#ifndef LOKI_PIMPL_H
-#define LOKI_PIMPL_H
+#ifndef LOKI_PIMPL_INC_
+#define LOKI_PIMPL_INC_
+
+// $Id$
 
-// $Header$
 
 ///  \defgroup PimplGroup Pimpl 
 
diff --git a/include/loki/RefToValue.h b/include/loki/RefToValue.h
index 837b513..afcd05e 100644
--- a/include/loki/RefToValue.h
+++ b/include/loki/RefToValue.h
@@ -10,8 +10,11 @@
 //     suitability of this software for any purpose. It is provided "as is" 
 //     without express or implied warranty.
 ////////////////////////////////////////////////////////////////////////////////
-#ifndef LOKI_REFTOVALUE_H
-#define LOKI_REFTOVALUE_H
+#ifndef LOKI_REFTOVALUE_INC_
+#define LOKI_REFTOVALUE_INC_
+
+// $Id$
+
 
 namespace Loki
 {
diff --git a/include/loki/Register.h b/include/loki/Register.h
index af177cf..6e7cc52 100644
--- a/include/loki/Register.h
+++ b/include/loki/Register.h
@@ -12,7 +12,8 @@
 #ifndef LOKI_REGISTER_INC_
 #define LOKI_REGISTER_INC_
 
-// $Header$ 
+// $Id$
+
 
 #include "TypeManip.h"
 #include "HierarchyGenerators.h"
diff --git a/include/loki/Visitor.h b/include/loki/Visitor.h
index d5dda06..f737e51 100644
--- a/include/loki/Visitor.h
+++ b/include/loki/Visitor.h
@@ -12,14 +12,14 @@
 //     suitability of this software for any purpose. It is provided "as is" 
 //     without express or implied warranty.
 ////////////////////////////////////////////////////////////////////////////////
-
-// $Header$
-
-///  \defgroup VisitorGroup Visitor
-
 #ifndef LOKI_VISITOR_INC_
 #define LOKI_VISITOR_INC_
 
+// $Id$
+
+
+///  \defgroup VisitorGroup Visitor
+
 #include "Typelist.h"
 #include "HierarchyGenerators.h"
 
diff --git a/include/loki/static_check.h b/include/loki/static_check.h
index 45ef291..8a07b48 100644
--- a/include/loki/static_check.h
+++ b/include/loki/static_check.h
@@ -12,13 +12,11 @@
 //     suitability of this software for any purpose. It is provided "as is" 
 //     without express or implied warranty.
 ////////////////////////////////////////////////////////////////////////////////
-
-// Last update: June 20, 2001
-
 #ifndef LOKI_STATIC_CHECK_INC_
 #define LOKI_STATIC_CHECK_INC_
 
-// $Header$
+// $Id$
+
 
 namespace Loki
 {