diff --git a/Foundation/include/Poco/AbstractCache.h b/Foundation/include/Poco/AbstractCache.h
index 05df6a8f0..c0f54e3fb 100644
--- a/Foundation/include/Poco/AbstractCache.h
+++ b/Foundation/include/Poco/AbstractCache.h
@@ -1,7 +1,7 @@
 //
 // AbstractCache.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/AbstractCache.h#17 $
+// $Id: //poco/1.4/Foundation/include/Poco/AbstractCache.h#1 $
 //
 // Library: Foundation
 // Package: Cache
@@ -36,8 +36,8 @@
 //
 
 
-#ifndef  Foundation_AbstractCache_INCLUDED
-#define  Foundation_AbstractCache_INCLUDED
+#ifndef Foundation_AbstractCache_INCLUDED
+#define Foundation_AbstractCache_INCLUDED
 
 
 #include "Poco/KeyValueArgs.h"
@@ -378,4 +378,4 @@ private:
 } // namespace Poco
 
 
-#endif
+#endif // Foundation_AbstractCache_INCLUDED
diff --git a/Foundation/include/Poco/AbstractDelegate.h b/Foundation/include/Poco/AbstractDelegate.h
index 7409ccc25..d63a8ce59 100644
--- a/Foundation/include/Poco/AbstractDelegate.h
+++ b/Foundation/include/Poco/AbstractDelegate.h
@@ -1,7 +1,7 @@
 //
 // AbstractDelegate.h
 //
-// $Id: //poco/svn/Foundation/include/Poco/AbstractDelegate.h#3 $
+// $Id: //poco/1.4/Foundation/include/Poco/AbstractDelegate.h#1 $
 //
 // Library: Foundation
 // Package: Events
@@ -36,8 +36,8 @@
 //
 
 
-#ifndef  Foundation_AbstractDelegate_INCLUDED
-#define  Foundation_AbstractDelegate_INCLUDED
+#ifndef Foundation_AbstractDelegate_INCLUDED
+#define Foundation_AbstractDelegate_INCLUDED
 
 
 #include "Poco/Foundation.h"
@@ -69,7 +69,7 @@ public:
 	}
 
 	virtual bool notify(const void* sender, TArgs& arguments) = 0;
-		/// Returns false, if the Delegate is no longer valid, thus indicating an expire
+		/// Returns false, if the Delegate is no longer valid, thus indicating an expire.
 
 	virtual AbstractDelegate* clone() const = 0;
 		/// Returns a deep-copy of the AbstractDelegate
@@ -93,4 +93,4 @@ protected:
 } // namespace Poco
 
 
-#endif
+#endif // Foundation_AbstractDelegate_INCLUDED
diff --git a/Foundation/include/Poco/AbstractPriorityDelegate.h b/Foundation/include/Poco/AbstractPriorityDelegate.h
index 8bfce0c87..f4f99f335 100644
--- a/Foundation/include/Poco/AbstractPriorityDelegate.h
+++ b/Foundation/include/Poco/AbstractPriorityDelegate.h
@@ -1,7 +1,7 @@
 //
 // AbstractPriorityDelegate.h
 //
-// $Id: //poco/svn/Foundation/include/Poco/AbstractPriorityDelegate.h#2 $
+// $Id: //poco/1.4/Foundation/include/Poco/AbstractPriorityDelegate.h#1 $
 //
 // Library: Foundation
 // Package: Events
@@ -36,8 +36,8 @@
 //
 
 
-#ifndef  Foundation_AbstractPriorityDelegate_INCLUDED
-#define  Foundation_AbstractPriorityDelegate_INCLUDED
+#ifndef Foundation_AbstractPriorityDelegate_INCLUDED
+#define Foundation_AbstractPriorityDelegate_INCLUDED
 
 
 #include "Poco/Foundation.h"
@@ -106,4 +106,4 @@ protected:
 } // namespace Poco
 
 
-#endif
+#endif // Foundation_AbstractPriorityDelegate_INCLUDED
diff --git a/Foundation/include/Poco/AccessExpirationDecorator.h b/Foundation/include/Poco/AccessExpirationDecorator.h
index a1938875a..baf66d704 100644
--- a/Foundation/include/Poco/AccessExpirationDecorator.h
+++ b/Foundation/include/Poco/AccessExpirationDecorator.h
@@ -1,7 +1,7 @@
 //
 // AccessExpirationDecorator.h
 //
-// $Id: //poco/svn/Foundation/include/Poco/AccessExpirationDecorator.h#2 $
+// $Id: //poco/1.4/Foundation/include/Poco/AccessExpirationDecorator.h#1 $
 //
 // Library: Foundation
 // Package: Events
@@ -36,8 +36,8 @@
 //
 
 
-#ifndef  Foundation_AccessExpirationDecorator_INCLUDED
-#define  Foundation_AccessExpirationDecorator_INCLUDED
+#ifndef Foundation_AccessExpirationDecorator_INCLUDED
+#define Foundation_AccessExpirationDecorator_INCLUDED
 
 
 #include "Poco/Timestamp.h"
@@ -102,4 +102,4 @@ private:
 } // namespace Poco
 
 
-#endif
+#endif // Foundation_AccessExpirationDecorator_INCLUDED
diff --git a/Foundation/include/Poco/AccessExpireCache.h b/Foundation/include/Poco/AccessExpireCache.h
index 5daeea1cf..d4af4bf71 100644
--- a/Foundation/include/Poco/AccessExpireCache.h
+++ b/Foundation/include/Poco/AccessExpireCache.h
@@ -1,7 +1,7 @@
 //
 // AccessExpireCache.h
 //
-// $Id: //poco/svn/Foundation/include/Poco/AccessExpireCache.h#2 $
+// $Id: //poco/1.4/Foundation/include/Poco/AccessExpireCache.h#1 $
 //
 // Library: Foundation
 // Package: Cache
@@ -36,8 +36,8 @@
 //
 
 
-#ifndef  Foundation_AccessExpireCache_INCLUDED
-#define  Foundation_AccessExpireCache_INCLUDED
+#ifndef Foundation_AccessExpireCache_INCLUDED
+#define Foundation_AccessExpireCache_INCLUDED
 
 
 #include "Poco/AbstractCache.h"
@@ -53,7 +53,7 @@ template <
 	class TMutex = FastMutex, 
 	class TEventMutex = FastMutex
 > 
-class AccessExpireCache: public AbstractCache<TKey, TValue, AccessExpireStrategy<TKey, TValue>, TMutex, TEventMutex >
+class AccessExpireCache: public AbstractCache<TKey, TValue, AccessExpireStrategy<TKey, TValue>, TMutex, TEventMutex>
 	/// An AccessExpireCache caches entries for a fixed time period (per default 10 minutes).
 	/// Entries expire when they are not accessed with get() during this time period. Each access resets
 	/// the start time for expiration.
@@ -82,4 +82,4 @@ private:
 } // namespace Poco
 
 
-#endif
+#endif // Foundation_AccessExpireCache_INCLUDED
diff --git a/Foundation/include/Poco/AccessExpireLRUCache.h b/Foundation/include/Poco/AccessExpireLRUCache.h
index 9e6165a46..bd71efaf5 100644
--- a/Foundation/include/Poco/AccessExpireLRUCache.h
+++ b/Foundation/include/Poco/AccessExpireLRUCache.h
@@ -1,7 +1,7 @@
 //
 // AccessExpireLRUCache.h
 //
-// $Id: //poco/svn/Foundation/include/Poco/AccessExpireLRUCache.h#2 $
+// $Id: //poco/1.4/Foundation/include/Poco/AccessExpireLRUCache.h#1 $
 //
 // Library: Foundation
 // Package: Cache
@@ -36,8 +36,8 @@
 //
 
 
-#ifndef  Foundation_AccessExpireLRUCache_INCLUDED
-#define  Foundation_AccessExpireLRUCache_INCLUDED
+#ifndef Foundation_AccessExpireLRUCache_INCLUDED
+#define Foundation_AccessExpireLRUCache_INCLUDED
 
 
 #include "Poco/AbstractCache.h"
@@ -62,7 +62,7 @@ class AccessExpireLRUCache: public AbstractCache<TKey, TValue, StrategyCollectio
 {
 public:
 	AccessExpireLRUCache(long cacheSize = 1024, Timestamp::TimeDiff expire = 600000): 
-		AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue>, TMutex, TEventMutex>(StrategyCollection<TKey, TValue>())
+		AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue>, TMutex, TEventMutex >(StrategyCollection<TKey, TValue>())
 	{
 		this->_strategy.pushBack(new LRUStrategy<TKey, TValue>(cacheSize));
 		this->_strategy.pushBack(new AccessExpireStrategy<TKey, TValue>(expire));
@@ -81,4 +81,4 @@ private:
 } // namespace Poco
 
 
-#endif
+#endif // Foundation_AccessExpireLRUCache_INCLUDED
diff --git a/Foundation/include/Poco/AccessExpireStrategy.h b/Foundation/include/Poco/AccessExpireStrategy.h
index 060e0e563..107bfaf0e 100644
--- a/Foundation/include/Poco/AccessExpireStrategy.h
+++ b/Foundation/include/Poco/AccessExpireStrategy.h
@@ -1,7 +1,7 @@
 //
 // AccessExpireStrategy.h
 //
-// $Id: //poco/svn/Foundation/include/Poco/AccessExpireStrategy.h#2 $
+// $Id: //poco/1.4/Foundation/include/Poco/AccessExpireStrategy.h#1 $
 //
 // Library: Foundation
 // Package: Cache
@@ -36,8 +36,8 @@
 //
 
 
-#ifndef  Foundation_AccessExpireStrategy_INCLUDED
-#define  Foundation_AccessExpireStrategy_INCLUDED
+#ifndef Foundation_AccessExpireStrategy_INCLUDED
+#define Foundation_AccessExpireStrategy_INCLUDED
 
 
 #include "Poco/KeyValueArgs.h"
@@ -90,4 +90,4 @@ public:
 } // namespace Poco
 
 
-#endif
+#endif // Foundation_AccessExpireStrategy_INCLUDED