diff --git a/Foundation/include/Poco/DirectoryIteratorStrategy.h b/Foundation/include/Poco/DirectoryIteratorStrategy.h
index d4ce2bb8a..7f5465d73 100644
--- a/Foundation/include/Poco/DirectoryIteratorStrategy.h
+++ b/Foundation/include/Poco/DirectoryIteratorStrategy.h
@@ -1,8 +1,6 @@
 //
 // RecursiveDirectoryIteratorStategies.h
 //
-// $Id$
-//
 // Library: Foundation
 // Package: Filesystem
 // Module:  RecursiveDirectoryIterator
diff --git a/Foundation/include/Poco/EventChannel.h b/Foundation/include/Poco/EventChannel.h
index bae18ac7f..07975167d 100644
--- a/Foundation/include/Poco/EventChannel.h
+++ b/Foundation/include/Poco/EventChannel.h
@@ -1,8 +1,6 @@
 //
 // EventChannel.h
 //
-// $Id$
-//
 // Library: Foundation
 // Package: Logging
 // Module:  EventChannel
diff --git a/Foundation/include/Poco/RecursiveDirectoryIterator.h b/Foundation/include/Poco/RecursiveDirectoryIterator.h
index acbb74ea7..c0ce2285e 100644
--- a/Foundation/include/Poco/RecursiveDirectoryIterator.h
+++ b/Foundation/include/Poco/RecursiveDirectoryIterator.h
@@ -1,8 +1,6 @@
 //
 // RecursiveDirectoryIterator.h
 //
-// $Id$
-//
 // Library: Foundation
 // Package: Filesystem
 // Module:  RecursiveDirectoryIterator
diff --git a/Foundation/include/Poco/RecursiveDirectoryIteratorImpl.h b/Foundation/include/Poco/RecursiveDirectoryIteratorImpl.h
index 09350f061..fb2d46704 100644
--- a/Foundation/include/Poco/RecursiveDirectoryIteratorImpl.h
+++ b/Foundation/include/Poco/RecursiveDirectoryIteratorImpl.h
@@ -1,8 +1,6 @@
 //
 // RecursiveDirectoryIteratorImpl.h
 //
-// $Id$
-//
 // Library: Foundation
 // Package: Filesystem
 // Module:  RecursiveDirectoryIterator
diff --git a/Foundation/include/Poco/SortedDirectoryIterator.h b/Foundation/include/Poco/SortedDirectoryIterator.h
index 08f1bfae6..94c822be4 100644
--- a/Foundation/include/Poco/SortedDirectoryIterator.h
+++ b/Foundation/include/Poco/SortedDirectoryIterator.h
@@ -1,8 +1,6 @@
 //
 // SortedDirectoryIterator.h
 //
-// $Id$
-//
 // Library: Foundation
 // Package: Filesystem
 // Module:  DirectoryIterator
diff --git a/Foundation/src/DirectoryIteratorStrategy.cpp b/Foundation/src/DirectoryIteratorStrategy.cpp
index 6823354c1..21c9755bb 100644
--- a/Foundation/src/DirectoryIteratorStrategy.cpp
+++ b/Foundation/src/DirectoryIteratorStrategy.cpp
@@ -1,8 +1,6 @@
 //
 // RecursiveDirectoryIteratorStategies.cpp
 //
-// $Id$
-//
 // Library: Foundation
 // Package: Filesystem
 // Module:  RecursiveDirectoryIterator
diff --git a/Foundation/src/EventChannel.cpp b/Foundation/src/EventChannel.cpp
index 0aaadde21..dc5bce726 100644
--- a/Foundation/src/EventChannel.cpp
+++ b/Foundation/src/EventChannel.cpp
@@ -1,8 +1,6 @@
 //
 // EventChannel.cpp
 //
-// $Id$
-//
 // Library: Foundation
 // Package: Logging
 // Module:  EventChannel
diff --git a/Foundation/src/SortedDirectoryIterator.cpp b/Foundation/src/SortedDirectoryIterator.cpp
index d85581584..3d2a84ef8 100644
--- a/Foundation/src/SortedDirectoryIterator.cpp
+++ b/Foundation/src/SortedDirectoryIterator.cpp
@@ -1,8 +1,6 @@
 //
 // SortedDirectoryIterator.cpp
 //
-// $Id$
-//
 // Library: Foundation
 // Package: Filesystem
 // Module:  DirectoryIterator
diff --git a/JSON/include/Poco/JSON/Array.h b/JSON/include/Poco/JSON/Array.h
index 1287e5dc5..558dc1807 100644
--- a/JSON/include/Poco/JSON/Array.h
+++ b/JSON/include/Poco/JSON/Array.h
@@ -1,8 +1,6 @@
 //
 // Array.h
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  Array
diff --git a/JSON/include/Poco/JSON/Handler.h b/JSON/include/Poco/JSON/Handler.h
index e21e20ff2..8c64f34ff 100644
--- a/JSON/include/Poco/JSON/Handler.h
+++ b/JSON/include/Poco/JSON/Handler.h
@@ -1,8 +1,6 @@
 //
 // Handler.h
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  Handler
diff --git a/JSON/include/Poco/JSON/JSON.h b/JSON/include/Poco/JSON/JSON.h
index 36f3f684a..36d762375 100644
--- a/JSON/include/Poco/JSON/JSON.h
+++ b/JSON/include/Poco/JSON/JSON.h
@@ -1,8 +1,6 @@
 //
 // JSON.h
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  JSON
diff --git a/JSON/include/Poco/JSON/JSONException.h b/JSON/include/Poco/JSON/JSONException.h
index 76d166dc8..058d36f0a 100644
--- a/JSON/include/Poco/JSON/JSONException.h
+++ b/JSON/include/Poco/JSON/JSONException.h
@@ -1,8 +1,6 @@
 //
 // JSONException.h
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  JSONException
diff --git a/JSON/include/Poco/JSON/Object.h b/JSON/include/Poco/JSON/Object.h
index b98c92149..cdb877857 100644
--- a/JSON/include/Poco/JSON/Object.h
+++ b/JSON/include/Poco/JSON/Object.h
@@ -1,8 +1,6 @@
 //
 // Object.h
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  Object
diff --git a/JSON/include/Poco/JSON/ParseHandler.h b/JSON/include/Poco/JSON/ParseHandler.h
index 3b88167bf..98cd69ed8 100644
--- a/JSON/include/Poco/JSON/ParseHandler.h
+++ b/JSON/include/Poco/JSON/ParseHandler.h
@@ -1,8 +1,6 @@
 //
 // ParseHandler.h
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  ParseHandler
diff --git a/JSON/include/Poco/JSON/Parser.h b/JSON/include/Poco/JSON/Parser.h
index 80d2439bf..892ec25fd 100644
--- a/JSON/include/Poco/JSON/Parser.h
+++ b/JSON/include/Poco/JSON/Parser.h
@@ -1,8 +1,6 @@
 //
 // Parser.h
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  Parser
diff --git a/JSON/include/Poco/JSON/ParserImpl.h b/JSON/include/Poco/JSON/ParserImpl.h
index 59385f5b6..0fe0aa2ff 100644
--- a/JSON/include/Poco/JSON/ParserImpl.h
+++ b/JSON/include/Poco/JSON/ParserImpl.h
@@ -1,8 +1,6 @@
 //
 // Parser.h
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  ParserImpl
diff --git a/JSON/include/Poco/JSON/PrintHandler.h b/JSON/include/Poco/JSON/PrintHandler.h
index 852bc5199..2e37da553 100644
--- a/JSON/include/Poco/JSON/PrintHandler.h
+++ b/JSON/include/Poco/JSON/PrintHandler.h
@@ -1,8 +1,6 @@
 //
 // PrintHandler.h
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  PrintHandler
diff --git a/JSON/include/Poco/JSON/Query.h b/JSON/include/Poco/JSON/Query.h
index a2e57830b..c639a3d7d 100644
--- a/JSON/include/Poco/JSON/Query.h
+++ b/JSON/include/Poco/JSON/Query.h
@@ -1,8 +1,6 @@
 //
 // Query.h
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  Query
diff --git a/JSON/include/Poco/JSON/Stringifier.h b/JSON/include/Poco/JSON/Stringifier.h
index f22d8633d..dc006c693 100644
--- a/JSON/include/Poco/JSON/Stringifier.h
+++ b/JSON/include/Poco/JSON/Stringifier.h
@@ -1,8 +1,6 @@
 //
 // Stringifier.h
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  Stringifier
diff --git a/JSON/include/Poco/JSON/Template.h b/JSON/include/Poco/JSON/Template.h
index 0b5c42c19..7e8ac51e0 100644
--- a/JSON/include/Poco/JSON/Template.h
+++ b/JSON/include/Poco/JSON/Template.h
@@ -1,8 +1,6 @@
 //
 // Template.h
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  Template
diff --git a/JSON/include/Poco/JSON/TemplateCache.h b/JSON/include/Poco/JSON/TemplateCache.h
index 205be2d14..0f5fcf095 100644
--- a/JSON/include/Poco/JSON/TemplateCache.h
+++ b/JSON/include/Poco/JSON/TemplateCache.h
@@ -1,8 +1,6 @@
 //
 // TemplateCache.h
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  TemplateCache
diff --git a/JSON/samples/Benchmark/src/Benchmark.cpp b/JSON/samples/Benchmark/src/Benchmark.cpp
index 735ea500b..2887ed420 100644
--- a/JSON/samples/Benchmark/src/Benchmark.cpp
+++ b/JSON/samples/Benchmark/src/Benchmark.cpp
@@ -1,8 +1,6 @@
 //
 // Benchmark.cpp
 //
-// $Id$
-//
 // This sample shows a benchmark of the JSON parser.
 //
 // Copyright (c) 2012, Applied Informatics Software Engineering GmbH.
diff --git a/JSON/src/Array.cpp b/JSON/src/Array.cpp
index ee038e990..8dfc9451d 100644
--- a/JSON/src/Array.cpp
+++ b/JSON/src/Array.cpp
@@ -1,8 +1,6 @@
 //
 // Array.cpp
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  Array
diff --git a/JSON/src/Handler.cpp b/JSON/src/Handler.cpp
index e682780c0..e207329ad 100644
--- a/JSON/src/Handler.cpp
+++ b/JSON/src/Handler.cpp
@@ -1,8 +1,6 @@
 //
 // Handler.cpp
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  Handler
diff --git a/JSON/src/JSONException.cpp b/JSON/src/JSONException.cpp
index e82c5fe51..0ab2a1312 100644
--- a/JSON/src/JSONException.cpp
+++ b/JSON/src/JSONException.cpp
@@ -1,8 +1,6 @@
 //
 // JSONException.cpp
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  JSONException
diff --git a/JSON/src/Object.cpp b/JSON/src/Object.cpp
index 1db895351..c72ab46f9 100644
--- a/JSON/src/Object.cpp
+++ b/JSON/src/Object.cpp
@@ -1,8 +1,6 @@
 //
 // Object.cpp
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  Object
diff --git a/JSON/src/ParseHandler.cpp b/JSON/src/ParseHandler.cpp
index 374c98043..1b271ff4f 100644
--- a/JSON/src/ParseHandler.cpp
+++ b/JSON/src/ParseHandler.cpp
@@ -1,8 +1,6 @@
 //
 // ParseHandler.cpp
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  ParseHandler
diff --git a/JSON/src/Parser.cpp b/JSON/src/Parser.cpp
index 7408b3641..480ef9a9c 100644
--- a/JSON/src/Parser.cpp
+++ b/JSON/src/Parser.cpp
@@ -1,8 +1,6 @@
 //
 // Parser.cpp
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  Parser
diff --git a/JSON/src/ParserImpl.cpp b/JSON/src/ParserImpl.cpp
index 4ab81827a..3812169e9 100644
--- a/JSON/src/ParserImpl.cpp
+++ b/JSON/src/ParserImpl.cpp
@@ -1,8 +1,6 @@
 //
 // Parser.cpp
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  Parser
diff --git a/JSON/src/PrintHandler.cpp b/JSON/src/PrintHandler.cpp
index 99c5e27ac..09617a6aa 100644
--- a/JSON/src/PrintHandler.cpp
+++ b/JSON/src/PrintHandler.cpp
@@ -1,8 +1,6 @@
 //
 // PrintHandler.cpp
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  PrintHandler
diff --git a/JSON/src/Query.cpp b/JSON/src/Query.cpp
index 036b7a7d8..45047a6a0 100644
--- a/JSON/src/Query.cpp
+++ b/JSON/src/Query.cpp
@@ -1,8 +1,6 @@
 //
 // Query.cpp
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  Query
diff --git a/JSON/src/Stringifier.cpp b/JSON/src/Stringifier.cpp
index 419abdc97..0aa0e9c80 100644
--- a/JSON/src/Stringifier.cpp
+++ b/JSON/src/Stringifier.cpp
@@ -1,8 +1,6 @@
 //
 // Stringifier.cpp
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  Stringifier
diff --git a/JSON/src/Template.cpp b/JSON/src/Template.cpp
index ad6f8fc22..c546302e8 100644
--- a/JSON/src/Template.cpp
+++ b/JSON/src/Template.cpp
@@ -1,8 +1,6 @@
 //
 // Template.cpp
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  Template
diff --git a/JSON/src/TemplateCache.cpp b/JSON/src/TemplateCache.cpp
index 648fb5263..d8df071d4 100644
--- a/JSON/src/TemplateCache.cpp
+++ b/JSON/src/TemplateCache.cpp
@@ -1,8 +1,6 @@
 //
 // TemplateCache.cpp
 //
-// $Id$
-//
 // Library: JSON
 // Package: JSON
 // Module:  TemplateCache
diff --git a/JSON/testsuite/src/JSONTestSuite.h b/JSON/testsuite/src/JSONTestSuite.h
index 431d80869..0d6f9a3fd 100644
--- a/JSON/testsuite/src/JSONTestSuite.h
+++ b/JSON/testsuite/src/JSONTestSuite.h
@@ -1,8 +1,6 @@
 //
 // JSONTestSuite.h
 //
-// $Id$
-//
 // Definition of the JSONTestSuite class.
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
diff --git a/MongoDB/include/Poco/MongoDB/Array.h b/MongoDB/include/Poco/MongoDB/Array.h
index bc2b588c6..ee306bb01 100644
--- a/MongoDB/include/Poco/MongoDB/Array.h
+++ b/MongoDB/include/Poco/MongoDB/Array.h
@@ -1,8 +1,6 @@
 //
 // Array.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  Array
diff --git a/MongoDB/include/Poco/MongoDB/BSONReader.h b/MongoDB/include/Poco/MongoDB/BSONReader.h
index e8567cdb6..3c5d9ba3e 100644
--- a/MongoDB/include/Poco/MongoDB/BSONReader.h
+++ b/MongoDB/include/Poco/MongoDB/BSONReader.h
@@ -1,8 +1,6 @@
 //
 // BSONReader.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  BSONReader
diff --git a/MongoDB/include/Poco/MongoDB/BSONWriter.h b/MongoDB/include/Poco/MongoDB/BSONWriter.h
index 92b6e1db3..01c9491e7 100644
--- a/MongoDB/include/Poco/MongoDB/BSONWriter.h
+++ b/MongoDB/include/Poco/MongoDB/BSONWriter.h
@@ -1,8 +1,6 @@
 //
 // BSONWriter.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  BSONWriter
diff --git a/MongoDB/include/Poco/MongoDB/Binary.h b/MongoDB/include/Poco/MongoDB/Binary.h
index f6fc3bdfc..02b6baf1b 100644
--- a/MongoDB/include/Poco/MongoDB/Binary.h
+++ b/MongoDB/include/Poco/MongoDB/Binary.h
@@ -1,8 +1,6 @@
 //
 // Binary.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  Binary
diff --git a/MongoDB/include/Poco/MongoDB/Connection.h b/MongoDB/include/Poco/MongoDB/Connection.h
index 825c6e4a4..b80c1b210 100644
--- a/MongoDB/include/Poco/MongoDB/Connection.h
+++ b/MongoDB/include/Poco/MongoDB/Connection.h
@@ -1,8 +1,6 @@
 //
 // Connection.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  Connection
diff --git a/MongoDB/include/Poco/MongoDB/Cursor.h b/MongoDB/include/Poco/MongoDB/Cursor.h
index dbf98a5cc..b9816b0db 100644
--- a/MongoDB/include/Poco/MongoDB/Cursor.h
+++ b/MongoDB/include/Poco/MongoDB/Cursor.h
@@ -1,8 +1,6 @@
 //
 // Cursor.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  Cursor
diff --git a/MongoDB/include/Poco/MongoDB/Database.h b/MongoDB/include/Poco/MongoDB/Database.h
index 84b81de16..ab276eecb 100644
--- a/MongoDB/include/Poco/MongoDB/Database.h
+++ b/MongoDB/include/Poco/MongoDB/Database.h
@@ -1,8 +1,6 @@
 //
 // Database.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  Database
diff --git a/MongoDB/include/Poco/MongoDB/DeleteRequest.h b/MongoDB/include/Poco/MongoDB/DeleteRequest.h
index d5cecfa45..8f3486d07 100644
--- a/MongoDB/include/Poco/MongoDB/DeleteRequest.h
+++ b/MongoDB/include/Poco/MongoDB/DeleteRequest.h
@@ -1,8 +1,6 @@
 //
 // DeleteRequest.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  DeleteRequest
diff --git a/MongoDB/include/Poco/MongoDB/Document.h b/MongoDB/include/Poco/MongoDB/Document.h
index 77cc451bc..674a1f789 100644
--- a/MongoDB/include/Poco/MongoDB/Document.h
+++ b/MongoDB/include/Poco/MongoDB/Document.h
@@ -1,8 +1,6 @@
 //
 // Document.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  Document
diff --git a/MongoDB/include/Poco/MongoDB/Element.h b/MongoDB/include/Poco/MongoDB/Element.h
index e2b468088..e6a41c401 100644
--- a/MongoDB/include/Poco/MongoDB/Element.h
+++ b/MongoDB/include/Poco/MongoDB/Element.h
@@ -1,8 +1,6 @@
 //
 // Element.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  Element
diff --git a/MongoDB/include/Poco/MongoDB/GetMoreRequest.h b/MongoDB/include/Poco/MongoDB/GetMoreRequest.h
index 778841ba7..f6c3f65ab 100644
--- a/MongoDB/include/Poco/MongoDB/GetMoreRequest.h
+++ b/MongoDB/include/Poco/MongoDB/GetMoreRequest.h
@@ -1,8 +1,6 @@
 //
 // GetMoreRequest.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  GetMoreRequest
diff --git a/MongoDB/include/Poco/MongoDB/InsertRequest.h b/MongoDB/include/Poco/MongoDB/InsertRequest.h
index 655d583a2..f9ed8a20b 100644
--- a/MongoDB/include/Poco/MongoDB/InsertRequest.h
+++ b/MongoDB/include/Poco/MongoDB/InsertRequest.h
@@ -1,8 +1,6 @@
 //
 // InsertRequest.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  InsertRequest
diff --git a/MongoDB/include/Poco/MongoDB/JavaScriptCode.h b/MongoDB/include/Poco/MongoDB/JavaScriptCode.h
index 693095ac3..6401743b8 100644
--- a/MongoDB/include/Poco/MongoDB/JavaScriptCode.h
+++ b/MongoDB/include/Poco/MongoDB/JavaScriptCode.h
@@ -1,8 +1,6 @@
 //
 // JavaScriptCode.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  JavaScriptCode
diff --git a/MongoDB/include/Poco/MongoDB/KillCursorsRequest.h b/MongoDB/include/Poco/MongoDB/KillCursorsRequest.h
index 7fd5d593d..83a808535 100644
--- a/MongoDB/include/Poco/MongoDB/KillCursorsRequest.h
+++ b/MongoDB/include/Poco/MongoDB/KillCursorsRequest.h
@@ -1,8 +1,6 @@
 //
 // KillCursorsRequest.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  KillCursorsRequest
diff --git a/MongoDB/include/Poco/MongoDB/Message.h b/MongoDB/include/Poco/MongoDB/Message.h
index d0ddb2991..f3f1edb43 100644
--- a/MongoDB/include/Poco/MongoDB/Message.h
+++ b/MongoDB/include/Poco/MongoDB/Message.h
@@ -1,8 +1,6 @@
 //
 // Message.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  Message
diff --git a/MongoDB/include/Poco/MongoDB/MessageHeader.h b/MongoDB/include/Poco/MongoDB/MessageHeader.h
index 813f7dc5f..1f86612aa 100644
--- a/MongoDB/include/Poco/MongoDB/MessageHeader.h
+++ b/MongoDB/include/Poco/MongoDB/MessageHeader.h
@@ -1,8 +1,6 @@
 //
 // MessageHeader.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  MessageHeader
diff --git a/MongoDB/include/Poco/MongoDB/MongoDB.h b/MongoDB/include/Poco/MongoDB/MongoDB.h
index 40107650c..9ccaca185 100644
--- a/MongoDB/include/Poco/MongoDB/MongoDB.h
+++ b/MongoDB/include/Poco/MongoDB/MongoDB.h
@@ -1,8 +1,6 @@
 //
 // MongoDB.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  MongoDB
diff --git a/MongoDB/include/Poco/MongoDB/ObjectId.h b/MongoDB/include/Poco/MongoDB/ObjectId.h
index 57157d4c2..8c58d80a4 100644
--- a/MongoDB/include/Poco/MongoDB/ObjectId.h
+++ b/MongoDB/include/Poco/MongoDB/ObjectId.h
@@ -1,8 +1,6 @@
 //
 // Array.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  ObjectId
diff --git a/MongoDB/include/Poco/MongoDB/PoolableConnectionFactory.h b/MongoDB/include/Poco/MongoDB/PoolableConnectionFactory.h
index bb92be05a..573310ad6 100644
--- a/MongoDB/include/Poco/MongoDB/PoolableConnectionFactory.h
+++ b/MongoDB/include/Poco/MongoDB/PoolableConnectionFactory.h
@@ -1,8 +1,6 @@
 //
 // PoolableConnectionFactory.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  PoolableConnectionFactory
diff --git a/MongoDB/include/Poco/MongoDB/QueryRequest.h b/MongoDB/include/Poco/MongoDB/QueryRequest.h
index cc4039822..410828749 100644
--- a/MongoDB/include/Poco/MongoDB/QueryRequest.h
+++ b/MongoDB/include/Poco/MongoDB/QueryRequest.h
@@ -1,8 +1,6 @@
 //
 // QueryRequest.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  QueryRequest
diff --git a/MongoDB/include/Poco/MongoDB/RegularExpression.h b/MongoDB/include/Poco/MongoDB/RegularExpression.h
index f962f41aa..49ef3b00b 100644
--- a/MongoDB/include/Poco/MongoDB/RegularExpression.h
+++ b/MongoDB/include/Poco/MongoDB/RegularExpression.h
@@ -1,8 +1,6 @@
 //
 // RegularExpression.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  RegularExpression
diff --git a/MongoDB/include/Poco/MongoDB/ReplicaSet.h b/MongoDB/include/Poco/MongoDB/ReplicaSet.h
index 16cd7add4..e4fb5741b 100644
--- a/MongoDB/include/Poco/MongoDB/ReplicaSet.h
+++ b/MongoDB/include/Poco/MongoDB/ReplicaSet.h
@@ -1,8 +1,6 @@
 //
 // ReplicaSet.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  ReplicaSet
diff --git a/MongoDB/include/Poco/MongoDB/RequestMessage.h b/MongoDB/include/Poco/MongoDB/RequestMessage.h
index 09470dc44..9ebb4a569 100644
--- a/MongoDB/include/Poco/MongoDB/RequestMessage.h
+++ b/MongoDB/include/Poco/MongoDB/RequestMessage.h
@@ -1,8 +1,6 @@
 //
 // RequestMessage.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  RequestMessage
diff --git a/MongoDB/include/Poco/MongoDB/ResponseMessage.h b/MongoDB/include/Poco/MongoDB/ResponseMessage.h
index 5450f41ec..dd9ecd23e 100644
--- a/MongoDB/include/Poco/MongoDB/ResponseMessage.h
+++ b/MongoDB/include/Poco/MongoDB/ResponseMessage.h
@@ -1,8 +1,6 @@
 //
 // ResponseMessage.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  ResponseMessage
diff --git a/MongoDB/include/Poco/MongoDB/UpdateRequest.h b/MongoDB/include/Poco/MongoDB/UpdateRequest.h
index ec08c810d..0aa14bcd7 100644
--- a/MongoDB/include/Poco/MongoDB/UpdateRequest.h
+++ b/MongoDB/include/Poco/MongoDB/UpdateRequest.h
@@ -1,8 +1,6 @@
 //
 // UpdateRequest.h
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  UpdateRequest
diff --git a/MongoDB/samples/SQLToMongo/src/SQLToMongo.cpp b/MongoDB/samples/SQLToMongo/src/SQLToMongo.cpp
index ecc90a195..e694e6658 100644
--- a/MongoDB/samples/SQLToMongo/src/SQLToMongo.cpp
+++ b/MongoDB/samples/SQLToMongo/src/SQLToMongo.cpp
@@ -1,8 +1,6 @@
 //
 // main.cpp
 //
-// $Id$
-//
 // This sample shows SQL to mongo Shell to C++ examples.
 //
 // Copyright (c) 2013, Applied Informatics Software Engineering GmbH.
diff --git a/MongoDB/src/Array.cpp b/MongoDB/src/Array.cpp
index 0ed520b2e..c6d96d137 100644
--- a/MongoDB/src/Array.cpp
+++ b/MongoDB/src/Array.cpp
@@ -1,8 +1,6 @@
 //
 // Array.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  Array
diff --git a/MongoDB/src/Binary.cpp b/MongoDB/src/Binary.cpp
index 98e840722..2cd18f81f 100644
--- a/MongoDB/src/Binary.cpp
+++ b/MongoDB/src/Binary.cpp
@@ -1,8 +1,6 @@
 //
 // Binary.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  Binary
diff --git a/MongoDB/src/Connection.cpp b/MongoDB/src/Connection.cpp
index edca15d1e..c7655c18a 100644
--- a/MongoDB/src/Connection.cpp
+++ b/MongoDB/src/Connection.cpp
@@ -1,8 +1,6 @@
 //
 // Connection.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  Connection
diff --git a/MongoDB/src/Cursor.cpp b/MongoDB/src/Cursor.cpp
index 14f77f0e3..69031e0ab 100644
--- a/MongoDB/src/Cursor.cpp
+++ b/MongoDB/src/Cursor.cpp
@@ -1,8 +1,6 @@
 //
 // Cursor.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  Cursor
diff --git a/MongoDB/src/Database.cpp b/MongoDB/src/Database.cpp
index cebb24772..359dcc70f 100644
--- a/MongoDB/src/Database.cpp
+++ b/MongoDB/src/Database.cpp
@@ -1,8 +1,6 @@
 //
 // Database.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  Database
diff --git a/MongoDB/src/DeleteRequest.cpp b/MongoDB/src/DeleteRequest.cpp
index 7215f3c2e..67a88c333 100644
--- a/MongoDB/src/DeleteRequest.cpp
+++ b/MongoDB/src/DeleteRequest.cpp
@@ -1,8 +1,6 @@
 //
 // DeleteRequest.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  DeleteRequest
diff --git a/MongoDB/src/Document.cpp b/MongoDB/src/Document.cpp
index 1a153589f..6e7bc065c 100644
--- a/MongoDB/src/Document.cpp
+++ b/MongoDB/src/Document.cpp
@@ -1,8 +1,6 @@
 //
 // Document.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  Document
diff --git a/MongoDB/src/Element.cpp b/MongoDB/src/Element.cpp
index a1e3d91e8..89629e050 100644
--- a/MongoDB/src/Element.cpp
+++ b/MongoDB/src/Element.cpp
@@ -1,8 +1,6 @@
 //
 // Element.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  Element
diff --git a/MongoDB/src/GetMoreRequest.cpp b/MongoDB/src/GetMoreRequest.cpp
index ae877f5c4..f8a6b73c6 100644
--- a/MongoDB/src/GetMoreRequest.cpp
+++ b/MongoDB/src/GetMoreRequest.cpp
@@ -1,8 +1,6 @@
 //
 // GetMoreRequest.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  GetMoreRequest
diff --git a/MongoDB/src/InsertRequest.cpp b/MongoDB/src/InsertRequest.cpp
index 5a940ef9e..ec8dc9cf9 100644
--- a/MongoDB/src/InsertRequest.cpp
+++ b/MongoDB/src/InsertRequest.cpp
@@ -1,8 +1,6 @@
 //
 // InsertRequest.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  InsertRequest
diff --git a/MongoDB/src/JavaScriptCode.cpp b/MongoDB/src/JavaScriptCode.cpp
index 8ae8ca144..41f5fcabe 100644
--- a/MongoDB/src/JavaScriptCode.cpp
+++ b/MongoDB/src/JavaScriptCode.cpp
@@ -1,8 +1,6 @@
 //
 // JavaScriptCode.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  JavaScriptCode
diff --git a/MongoDB/src/KillCursorsRequest.cpp b/MongoDB/src/KillCursorsRequest.cpp
index 912d18e98..7bf133a9c 100644
--- a/MongoDB/src/KillCursorsRequest.cpp
+++ b/MongoDB/src/KillCursorsRequest.cpp
@@ -1,8 +1,6 @@
 //
 // KillCursorsRequest.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  KillCursorsRequest
diff --git a/MongoDB/src/Message.cpp b/MongoDB/src/Message.cpp
index fee51e77e..c29d282d1 100644
--- a/MongoDB/src/Message.cpp
+++ b/MongoDB/src/Message.cpp
@@ -1,8 +1,6 @@
 //
 // Message.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  Message
diff --git a/MongoDB/src/MessageHeader.cpp b/MongoDB/src/MessageHeader.cpp
index 949c6cc4d..222121243 100644
--- a/MongoDB/src/MessageHeader.cpp
+++ b/MongoDB/src/MessageHeader.cpp
@@ -1,8 +1,6 @@
 //
 // MessageHeader.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  MessageHeader
diff --git a/MongoDB/src/ObjectId.cpp b/MongoDB/src/ObjectId.cpp
index 5a79f6989..3065a2ffc 100644
--- a/MongoDB/src/ObjectId.cpp
+++ b/MongoDB/src/ObjectId.cpp
@@ -1,8 +1,6 @@
 //
 // ObjectId.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  ObjectId
diff --git a/MongoDB/src/QueryRequest.cpp b/MongoDB/src/QueryRequest.cpp
index 216dfe7e7..7044335ba 100644
--- a/MongoDB/src/QueryRequest.cpp
+++ b/MongoDB/src/QueryRequest.cpp
@@ -1,8 +1,6 @@
 //
 // QueryRequest.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  QueryRequest
diff --git a/MongoDB/src/RegularExpression.cpp b/MongoDB/src/RegularExpression.cpp
index 4c6ce193e..e95e7da82 100644
--- a/MongoDB/src/RegularExpression.cpp
+++ b/MongoDB/src/RegularExpression.cpp
@@ -1,8 +1,6 @@
 //
 // RegularExpression.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  RegularExpression
diff --git a/MongoDB/src/ReplicaSet.cpp b/MongoDB/src/ReplicaSet.cpp
index d00034093..b56fea493 100644
--- a/MongoDB/src/ReplicaSet.cpp
+++ b/MongoDB/src/ReplicaSet.cpp
@@ -1,8 +1,6 @@
 //
 // ReplicaSet.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  ReplicaSet
diff --git a/MongoDB/src/RequestMessage.cpp b/MongoDB/src/RequestMessage.cpp
index 602a2f839..6391d9661 100644
--- a/MongoDB/src/RequestMessage.cpp
+++ b/MongoDB/src/RequestMessage.cpp
@@ -1,8 +1,6 @@
 //
 // RequestMessage.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  RequestMessage
diff --git a/MongoDB/src/ResponseMessage.cpp b/MongoDB/src/ResponseMessage.cpp
index 56b129554..3254ace63 100644
--- a/MongoDB/src/ResponseMessage.cpp
+++ b/MongoDB/src/ResponseMessage.cpp
@@ -1,8 +1,6 @@
 //
 // ResponseMessage.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  ResponseMessage
diff --git a/MongoDB/src/UpdateRequest.cpp b/MongoDB/src/UpdateRequest.cpp
index 9007ed1d1..2af4621ff 100644
--- a/MongoDB/src/UpdateRequest.cpp
+++ b/MongoDB/src/UpdateRequest.cpp
@@ -1,8 +1,6 @@
 //
 // UpdateRequest.cpp
 //
-// $Id$
-//
 // Library: MongoDB
 // Package: MongoDB
 // Module:  UpdateRequest
diff --git a/MongoDB/testsuite/src/Driver.cpp b/MongoDB/testsuite/src/Driver.cpp
index 82ed47087..2a7349645 100644
--- a/MongoDB/testsuite/src/Driver.cpp
+++ b/MongoDB/testsuite/src/Driver.cpp
@@ -1,8 +1,6 @@
 //
 // Driver.cpp
 //
-// $Id$
-//
 // Console-based test driver for Poco MongoDB.
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
diff --git a/MongoDB/testsuite/src/MongoDBTest.cpp b/MongoDB/testsuite/src/MongoDBTest.cpp
index 42246386a..0f8060a7d 100644
--- a/MongoDB/testsuite/src/MongoDBTest.cpp
+++ b/MongoDB/testsuite/src/MongoDBTest.cpp
@@ -1,8 +1,6 @@
 //
 // MongoDBTest.cpp
 //
-// $Id$
-//
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
 //
diff --git a/MongoDB/testsuite/src/MongoDBTest.h b/MongoDB/testsuite/src/MongoDBTest.h
index bcab44ddc..9818c4de4 100644
--- a/MongoDB/testsuite/src/MongoDBTest.h
+++ b/MongoDB/testsuite/src/MongoDBTest.h
@@ -1,8 +1,6 @@
 //
 // MongoDBTest.h
 //
-// $Id$
-//
 // Definition of the MongoDBTest class.
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
diff --git a/MongoDB/testsuite/src/MongoDBTestSuite.cpp b/MongoDB/testsuite/src/MongoDBTestSuite.cpp
index e44abb94b..29f2a0fde 100644
--- a/MongoDB/testsuite/src/MongoDBTestSuite.cpp
+++ b/MongoDB/testsuite/src/MongoDBTestSuite.cpp
@@ -1,8 +1,6 @@
 //
 // MongoDBTestSuite.cpp
 //
-// $Id$
-//
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
 //
diff --git a/MongoDB/testsuite/src/MongoDBTestSuite.h b/MongoDB/testsuite/src/MongoDBTestSuite.h
index 78fe83e61..6e79110c7 100644
--- a/MongoDB/testsuite/src/MongoDBTestSuite.h
+++ b/MongoDB/testsuite/src/MongoDBTestSuite.h
@@ -1,8 +1,6 @@
 //
 // MongoDBTestSuite.h
 //
-// $Id$
-//
 // Definition of the MongoDBTestSuite class.
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
diff --git a/MongoDB/testsuite/src/WinCEDriver.cpp b/MongoDB/testsuite/src/WinCEDriver.cpp
index 4eb5b6801..929275cbf 100644
--- a/MongoDB/testsuite/src/WinCEDriver.cpp
+++ b/MongoDB/testsuite/src/WinCEDriver.cpp
@@ -1,8 +1,6 @@
 //
 // WinCEDriver.cpp
 //
-// $Id$
-//
 // Console-based test driver for Windows CE.
 //
 // Copyright (c) 2004-2010, Applied Informatics Software Engineering GmbH.
diff --git a/MongoDB/testsuite/src/WinDriver.cpp b/MongoDB/testsuite/src/WinDriver.cpp
index 384b56574..27a445dfd 100644
--- a/MongoDB/testsuite/src/WinDriver.cpp
+++ b/MongoDB/testsuite/src/WinDriver.cpp
@@ -1,8 +1,6 @@
 //
 // WinDriver.cpp
 //
-// $Id$
-//
 // Windows test driver for Poco MongoDB.
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
diff --git a/Net/include/Poco/Net/OAuth10Credentials.h b/Net/include/Poco/Net/OAuth10Credentials.h
index a7b59b630..1402d40d5 100644
--- a/Net/include/Poco/Net/OAuth10Credentials.h
+++ b/Net/include/Poco/Net/OAuth10Credentials.h
@@ -1,8 +1,6 @@
 //
 // OAuth10Credentials.h
 //
-// $Id$
-//
 // Library: Net
 // Package: OAuth
 // Module:	OAuth10Credentials
diff --git a/Net/include/Poco/Net/OAuth20Credentials.h b/Net/include/Poco/Net/OAuth20Credentials.h
index e622cca1e..6935f2dfa 100644
--- a/Net/include/Poco/Net/OAuth20Credentials.h
+++ b/Net/include/Poco/Net/OAuth20Credentials.h
@@ -1,8 +1,6 @@
 //
 // OAuth20Credentials.h
 //
-// $Id$
-//
 // Library: Net
 // Package: OAuth
 // Module:	OAuth20Credentials
diff --git a/Net/src/OAuth10Credentials.cpp b/Net/src/OAuth10Credentials.cpp
index c0f6f01c7..ad769704d 100644
--- a/Net/src/OAuth10Credentials.cpp
+++ b/Net/src/OAuth10Credentials.cpp
@@ -1,8 +1,6 @@
 //
 // OAuth10Credentials.cpp
 //
-// $Id$
-//
 // Library: Net
 // Package: OAuth
 // Module:	OAuth10Credentials
diff --git a/Net/src/OAuth20Credentials.cpp b/Net/src/OAuth20Credentials.cpp
index 36e79701d..392115ad5 100644
--- a/Net/src/OAuth20Credentials.cpp
+++ b/Net/src/OAuth20Credentials.cpp
@@ -1,8 +1,6 @@
 //
 // OAuth20Credentials.cpp
 //
-// $Id$
-//
 // Library: Net
 // Package: OAuth
 // Module:	OAuth20Credentials
diff --git a/Net/testsuite/src/OAuth10CredentialsTest.cpp b/Net/testsuite/src/OAuth10CredentialsTest.cpp
index c47b8ba6e..d177a3182 100644
--- a/Net/testsuite/src/OAuth10CredentialsTest.cpp
+++ b/Net/testsuite/src/OAuth10CredentialsTest.cpp
@@ -1,8 +1,6 @@
 //
 // OAuth10CredentialsTest.cpp
 //
-// $Id$
-//
 // Copyright (c) 2014, Applied Informatics Software Engineering GmbH.
 // and Contributors.
 //
diff --git a/Net/testsuite/src/OAuth10CredentialsTest.h b/Net/testsuite/src/OAuth10CredentialsTest.h
index eb035426f..77a2fc585 100644
--- a/Net/testsuite/src/OAuth10CredentialsTest.h
+++ b/Net/testsuite/src/OAuth10CredentialsTest.h
@@ -1,8 +1,6 @@
 //
 // OAuth10CredentialsTest.h
 //
-// $Id$
-//
 // Definition of the OAuth10CredentialsTest class.
 //
 // Copyright (c) 2014, Applied Informatics Software Engineering GmbH.
diff --git a/Net/testsuite/src/OAuth20CredentialsTest.cpp b/Net/testsuite/src/OAuth20CredentialsTest.cpp
index 6735cf0f8..dde41f805 100644
--- a/Net/testsuite/src/OAuth20CredentialsTest.cpp
+++ b/Net/testsuite/src/OAuth20CredentialsTest.cpp
@@ -1,8 +1,6 @@
 //
 // OAuth20CredentialsTest.cpp
 //
-// $Id$
-//
 // Copyright (c) 2014, Applied Informatics Software Engineering GmbH.
 // and Contributors.
 //
diff --git a/Net/testsuite/src/OAuth20CredentialsTest.h b/Net/testsuite/src/OAuth20CredentialsTest.h
index f146d456f..04a65d948 100644
--- a/Net/testsuite/src/OAuth20CredentialsTest.h
+++ b/Net/testsuite/src/OAuth20CredentialsTest.h
@@ -1,8 +1,6 @@
 //
 // OAuth20CredentialsTest.h
 //
-// $Id$
-//
 // Definition of the OAuth20CredentialsTest class.
 //
 // Copyright (c) 2014, Applied Informatics Software Engineering GmbH.
diff --git a/Net/testsuite/src/OAuthTestSuite.cpp b/Net/testsuite/src/OAuthTestSuite.cpp
index d1ca6f6a1..56c3a32f2 100644
--- a/Net/testsuite/src/OAuthTestSuite.cpp
+++ b/Net/testsuite/src/OAuthTestSuite.cpp
@@ -1,8 +1,6 @@
 //
 // OAuthTestSuite.cpp
 //
-// $Id$
-//
 // Copyright (c) 2014, Applied Informatics Software Engineering GmbH.
 // and Contributors.
 //
diff --git a/Net/testsuite/src/OAuthTestSuite.h b/Net/testsuite/src/OAuthTestSuite.h
index 7ecb345f3..e1a9d499f 100644
--- a/Net/testsuite/src/OAuthTestSuite.h
+++ b/Net/testsuite/src/OAuthTestSuite.h
@@ -1,8 +1,6 @@
 //
 // OAuthTestSuite.h
 //
-// $Id$
-//
 // Definition of the OAuthTestSuite class.
 //
 // Copyright (c) 2014, Applied Informatics Software Engineering GmbH.
diff --git a/NetSSL_Win/include/Poco/Net/AutoSecBufferDesc.h b/NetSSL_Win/include/Poco/Net/AutoSecBufferDesc.h
index 432eaba7d..a6aea8935 100644
--- a/NetSSL_Win/include/Poco/Net/AutoSecBufferDesc.h
+++ b/NetSSL_Win/include/Poco/Net/AutoSecBufferDesc.h
@@ -1,8 +1,6 @@
 //
 // AutoSecBufferDesc.h
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  AutoSecBufferDesc
diff --git a/NetSSL_Win/include/Poco/Net/CertificateHandlerFactory.h b/NetSSL_Win/include/Poco/Net/CertificateHandlerFactory.h
index d957dc4a4..62f1a5ce4 100644
--- a/NetSSL_Win/include/Poco/Net/CertificateHandlerFactory.h
+++ b/NetSSL_Win/include/Poco/Net/CertificateHandlerFactory.h
@@ -1,8 +1,6 @@
 //
 // CertificateHandlerFactory.h
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  CertificateHandlerFactory
diff --git a/NetSSL_Win/include/Poco/Net/Context.h b/NetSSL_Win/include/Poco/Net/Context.h
index d14619f3c..090a0cf7c 100644
--- a/NetSSL_Win/include/Poco/Net/Context.h
+++ b/NetSSL_Win/include/Poco/Net/Context.h
@@ -1,8 +1,6 @@
 //
 // Context.h
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  Context
diff --git a/NetSSL_Win/include/Poco/Net/InvalidCertificateHandler.h b/NetSSL_Win/include/Poco/Net/InvalidCertificateHandler.h
index 088998b6a..26f0f1daf 100644
--- a/NetSSL_Win/include/Poco/Net/InvalidCertificateHandler.h
+++ b/NetSSL_Win/include/Poco/Net/InvalidCertificateHandler.h
@@ -1,8 +1,6 @@
 //
 // InvalidCertificateHandler.h
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  InvalidCertificateHandler
diff --git a/NetSSL_Win/include/Poco/Net/KeyConsoleHandler.h b/NetSSL_Win/include/Poco/Net/KeyConsoleHandler.h
index ae9ca9164..2c09eb9eb 100644
--- a/NetSSL_Win/include/Poco/Net/KeyConsoleHandler.h
+++ b/NetSSL_Win/include/Poco/Net/KeyConsoleHandler.h
@@ -1,8 +1,6 @@
 //
 // KeyConsoleHandler.h
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  KeyConsoleHandler
diff --git a/NetSSL_Win/include/Poco/Net/KeyFileHandler.h b/NetSSL_Win/include/Poco/Net/KeyFileHandler.h
index 9ac09b049..6faa28a77 100644
--- a/NetSSL_Win/include/Poco/Net/KeyFileHandler.h
+++ b/NetSSL_Win/include/Poco/Net/KeyFileHandler.h
@@ -1,8 +1,6 @@
 //
 // KeyFileHandler.h
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  KeyFileHandler
diff --git a/NetSSL_Win/include/Poco/Net/PrivateKeyFactory.h b/NetSSL_Win/include/Poco/Net/PrivateKeyFactory.h
index c0ef9b8d8..096c7a227 100644
--- a/NetSSL_Win/include/Poco/Net/PrivateKeyFactory.h
+++ b/NetSSL_Win/include/Poco/Net/PrivateKeyFactory.h
@@ -1,8 +1,6 @@
 //
 // PrivateKeyFactory.h
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  PrivateKeyFactory
diff --git a/NetSSL_Win/include/Poco/Net/PrivateKeyFactoryMgr.h b/NetSSL_Win/include/Poco/Net/PrivateKeyFactoryMgr.h
index 21a9d846f..07afb2336 100644
--- a/NetSSL_Win/include/Poco/Net/PrivateKeyFactoryMgr.h
+++ b/NetSSL_Win/include/Poco/Net/PrivateKeyFactoryMgr.h
@@ -1,8 +1,6 @@
 //
 // PrivateKeyFactoryMgr.h
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  PrivateKeyFactoryMgr
diff --git a/NetSSL_Win/include/Poco/Net/PrivateKeyPassphraseHandler.h b/NetSSL_Win/include/Poco/Net/PrivateKeyPassphraseHandler.h
index 288c1bf78..6f49afa78 100644
--- a/NetSSL_Win/include/Poco/Net/PrivateKeyPassphraseHandler.h
+++ b/NetSSL_Win/include/Poco/Net/PrivateKeyPassphraseHandler.h
@@ -1,8 +1,6 @@
 //
 // PrivateKeyPassphraseHandler.h
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  PrivateKeyPassphraseHandler
diff --git a/NetSSL_Win/include/Poco/Net/SSLException.h b/NetSSL_Win/include/Poco/Net/SSLException.h
index c26924cfa..69d3192e0 100644
--- a/NetSSL_Win/include/Poco/Net/SSLException.h
+++ b/NetSSL_Win/include/Poco/Net/SSLException.h
@@ -1,8 +1,6 @@
 //
 // SSLException.h
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  SSLException
diff --git a/NetSSL_Win/include/Poco/Net/SSLManager.h b/NetSSL_Win/include/Poco/Net/SSLManager.h
index 608b99e47..e2e063ff7 100644
--- a/NetSSL_Win/include/Poco/Net/SSLManager.h
+++ b/NetSSL_Win/include/Poco/Net/SSLManager.h
@@ -1,8 +1,6 @@
 //
 // SSLManager.h
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  SSLManager
diff --git a/NetSSL_Win/include/Poco/Net/SecureSocketImpl.h b/NetSSL_Win/include/Poco/Net/SecureSocketImpl.h
index cc280cba7..6e644a64b 100644
--- a/NetSSL_Win/include/Poco/Net/SecureSocketImpl.h
+++ b/NetSSL_Win/include/Poco/Net/SecureSocketImpl.h
@@ -1,8 +1,6 @@
 //
 // SecureSocketImpl.h
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLSockets
 // Module:  SecureSocketImpl
diff --git a/NetSSL_Win/include/Poco/Net/Utility.h b/NetSSL_Win/include/Poco/Net/Utility.h
index b82b7086e..0e5e837a2 100644
--- a/NetSSL_Win/include/Poco/Net/Utility.h
+++ b/NetSSL_Win/include/Poco/Net/Utility.h
@@ -1,8 +1,6 @@
 //
 // Utility.h
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  Utility
diff --git a/NetSSL_Win/include/Poco/Net/X509Certificate.h b/NetSSL_Win/include/Poco/Net/X509Certificate.h
index fe0a0208b..99fffe805 100644
--- a/NetSSL_Win/include/Poco/Net/X509Certificate.h
+++ b/NetSSL_Win/include/Poco/Net/X509Certificate.h
@@ -1,8 +1,6 @@
 //
 // X509Certificate.h
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: Certificate
 // Module:  X509Certificate
diff --git a/NetSSL_Win/src/AcceptCertificateHandler.cpp b/NetSSL_Win/src/AcceptCertificateHandler.cpp
index 53dc712cf..99e09d800 100644
--- a/NetSSL_Win/src/AcceptCertificateHandler.cpp
+++ b/NetSSL_Win/src/AcceptCertificateHandler.cpp
@@ -1,8 +1,6 @@
 //
 // AcceptCertificateHandler.cpp
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  AcceptCertificateHandler
diff --git a/NetSSL_Win/src/Context.cpp b/NetSSL_Win/src/Context.cpp
index 5c9a55420..afe1a729a 100644
--- a/NetSSL_Win/src/Context.cpp
+++ b/NetSSL_Win/src/Context.cpp
@@ -1,8 +1,6 @@
 //
 // Context.cpp
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  Context
diff --git a/NetSSL_Win/src/KeyConsoleHandler.cpp b/NetSSL_Win/src/KeyConsoleHandler.cpp
index 6e1d1a0e4..aae2a259e 100644
--- a/NetSSL_Win/src/KeyConsoleHandler.cpp
+++ b/NetSSL_Win/src/KeyConsoleHandler.cpp
@@ -1,8 +1,6 @@
 //
 // KeyConsoleHandler.cpp
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  KeyConsoleHandler
diff --git a/NetSSL_Win/src/KeyFileHandler.cpp b/NetSSL_Win/src/KeyFileHandler.cpp
index 1efeaf9aa..2264f78be 100644
--- a/NetSSL_Win/src/KeyFileHandler.cpp
+++ b/NetSSL_Win/src/KeyFileHandler.cpp
@@ -1,8 +1,6 @@
 //
 // KeyFileHandler.cpp
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  KeyFileHandler
diff --git a/NetSSL_Win/src/PrivateKeyFactory.cpp b/NetSSL_Win/src/PrivateKeyFactory.cpp
index e75f586f0..eb07f03b5 100644
--- a/NetSSL_Win/src/PrivateKeyFactory.cpp
+++ b/NetSSL_Win/src/PrivateKeyFactory.cpp
@@ -1,8 +1,6 @@
 //
 // PrivateKeyFactory.cpp
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  PrivateKeyFactory
diff --git a/NetSSL_Win/src/PrivateKeyFactoryMgr.cpp b/NetSSL_Win/src/PrivateKeyFactoryMgr.cpp
index 3886728d6..f91eadb80 100644
--- a/NetSSL_Win/src/PrivateKeyFactoryMgr.cpp
+++ b/NetSSL_Win/src/PrivateKeyFactoryMgr.cpp
@@ -1,8 +1,6 @@
 //
 // PrivateKeyFactoryMgr.cpp
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  PrivateKeyFactoryMgr
diff --git a/NetSSL_Win/src/PrivateKeyPassphraseHandler.cpp b/NetSSL_Win/src/PrivateKeyPassphraseHandler.cpp
index fccbb85c9..d60205685 100644
--- a/NetSSL_Win/src/PrivateKeyPassphraseHandler.cpp
+++ b/NetSSL_Win/src/PrivateKeyPassphraseHandler.cpp
@@ -1,8 +1,6 @@
 //
 // PrivateKeyPassphraseHandler.cpp
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  PrivateKeyPassphraseHandler
diff --git a/NetSSL_Win/src/SSLException.cpp b/NetSSL_Win/src/SSLException.cpp
index 6a313da3d..1ad928f99 100644
--- a/NetSSL_Win/src/SSLException.cpp
+++ b/NetSSL_Win/src/SSLException.cpp
@@ -1,8 +1,6 @@
 //
 // SSLException.cpp
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  SSLException
diff --git a/NetSSL_Win/src/SecureSocketImpl.cpp b/NetSSL_Win/src/SecureSocketImpl.cpp
index 17e035768..043331bf9 100644
--- a/NetSSL_Win/src/SecureSocketImpl.cpp
+++ b/NetSSL_Win/src/SecureSocketImpl.cpp
@@ -1,8 +1,6 @@
 //
 // SecureSocketImpl.cpp
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLSockets
 // Module:  SecureSocketImpl
diff --git a/NetSSL_Win/src/Utility.cpp b/NetSSL_Win/src/Utility.cpp
index 11de03169..5970bf8a2 100644
--- a/NetSSL_Win/src/Utility.cpp
+++ b/NetSSL_Win/src/Utility.cpp
@@ -1,8 +1,6 @@
 //
 // Utility.cpp
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: SSLCore
 // Module:  Utility
diff --git a/NetSSL_Win/src/X509Certificate.cpp b/NetSSL_Win/src/X509Certificate.cpp
index 084e2ed2a..58a8a2cfd 100644
--- a/NetSSL_Win/src/X509Certificate.cpp
+++ b/NetSSL_Win/src/X509Certificate.cpp
@@ -1,8 +1,6 @@
 //
 // X509Certificate.cpp
 //
-// $Id$
-//
 // Library: NetSSL_Win
 // Package: Certificate
 // Module:  X509Certificate
diff --git a/NetSSL_Win/testsuite/src/HTTPSServerTest.cpp b/NetSSL_Win/testsuite/src/HTTPSServerTest.cpp
index 4df59314a..2a29cae24 100644
--- a/NetSSL_Win/testsuite/src/HTTPSServerTest.cpp
+++ b/NetSSL_Win/testsuite/src/HTTPSServerTest.cpp
@@ -1,8 +1,6 @@
 //
 // HTTPSServerTest.cpp
 //
-// $Id$
-//
 // Copyright (c) 2006-2014, Applied Informatics Software Engineering GmbH.
 // and Contributors.
 //
diff --git a/NetSSL_Win/testsuite/src/HTTPSServerTest.h b/NetSSL_Win/testsuite/src/HTTPSServerTest.h
index dd3062e81..2b111e6b8 100644
--- a/NetSSL_Win/testsuite/src/HTTPSServerTest.h
+++ b/NetSSL_Win/testsuite/src/HTTPSServerTest.h
@@ -1,8 +1,6 @@
 //
 // HTTPSServerTest.h
 //
-// $Id$
-//
 // Definition of the HTTPSServerTest class.
 //
 // Copyright (c) 2006-2014, Applied Informatics Software Engineering GmbH.
diff --git a/SevenZip/include/Poco/SevenZip/Archive.h b/SevenZip/include/Poco/SevenZip/Archive.h
index 24e9843bd..e119d2156 100644
--- a/SevenZip/include/Poco/SevenZip/Archive.h
+++ b/SevenZip/include/Poco/SevenZip/Archive.h
@@ -1,8 +1,6 @@
 //
 // Archive.h
 //
-// $Id$
-//
 // Library: SevenZip
 // Package: Archive
 // Module:  Archive
diff --git a/SevenZip/include/Poco/SevenZip/ArchiveEntry.h b/SevenZip/include/Poco/SevenZip/ArchiveEntry.h
index 1b730bb1f..278161cd3 100644
--- a/SevenZip/include/Poco/SevenZip/ArchiveEntry.h
+++ b/SevenZip/include/Poco/SevenZip/ArchiveEntry.h
@@ -1,8 +1,6 @@
 //
 // ArchiveEntry.h
 //
-// $Id$
-//
 // Library: SevenZip
 // Package: Archive
 // Module:  ArchiveEntry
diff --git a/SevenZip/include/Poco/SevenZip/SevenZip.h b/SevenZip/include/Poco/SevenZip/SevenZip.h
index 5e1f7fe25..f377b52b2 100644
--- a/SevenZip/include/Poco/SevenZip/SevenZip.h
+++ b/SevenZip/include/Poco/SevenZip/SevenZip.h
@@ -1,8 +1,6 @@
 //
 // SevenZip.h
 //
-// $Id$
-//
 // Library: SevenZip
 // Package: SevenZip
 // Module:  SevenZip
diff --git a/SevenZip/samples/un7zip/src/un7zip.cpp b/SevenZip/samples/un7zip/src/un7zip.cpp
index e7d620371..d3c6b91b0 100644
--- a/SevenZip/samples/un7zip/src/un7zip.cpp
+++ b/SevenZip/samples/un7zip/src/un7zip.cpp
@@ -1,8 +1,6 @@
 //
 // un7zip.cpp
 //
-// $Id$
-//
 // This sample demonstrates the Archive class.
 //
 // Copyright (c) 2014, Applied Informatics Software Engineering GmbH.
diff --git a/SevenZip/src/Archive.cpp b/SevenZip/src/Archive.cpp
index cd2844007..5d8dd780c 100644
--- a/SevenZip/src/Archive.cpp
+++ b/SevenZip/src/Archive.cpp
@@ -1,8 +1,6 @@
 //
 // Archive.cpp
 //
-// $Id$
-//
 // Library: SevenZip
 // Package: Archive
 // Module:  Archive
diff --git a/SevenZip/src/ArchiveEntry.cpp b/SevenZip/src/ArchiveEntry.cpp
index 8b710e65b..edc5d74c3 100644
--- a/SevenZip/src/ArchiveEntry.cpp
+++ b/SevenZip/src/ArchiveEntry.cpp
@@ -1,8 +1,6 @@
 //
 // ArchiveEntry.cpp
 //
-// $Id$
-//
 // Library: SevenZip
 // Package: Archive
 // Module:  ArchiveEntry
diff --git a/Util/include/Poco/Util/JSONConfiguration.h b/Util/include/Poco/Util/JSONConfiguration.h
index f8e2f3c44..d1fa53ece 100644
--- a/Util/include/Poco/Util/JSONConfiguration.h
+++ b/Util/include/Poco/Util/JSONConfiguration.h
@@ -1,8 +1,6 @@
 //
 // JSONConfiguration.h
 //
-// $Id$
-//
 // Library: Util
 // Package: Util
 // Module:  JSONConfiguration
diff --git a/Util/src/JSONConfiguration.cpp b/Util/src/JSONConfiguration.cpp
index 2cb912077..282ac8ce5 100644
--- a/Util/src/JSONConfiguration.cpp
+++ b/Util/src/JSONConfiguration.cpp
@@ -1,8 +1,6 @@
 //
 // JSONConfiguration.cpp
 //
-// $Id$
-//
 // Library: Util
 // Package: JSON
 // Module:  JSONConfiguration
diff --git a/Util/testsuite/src/JSONConfigurationTest.cpp b/Util/testsuite/src/JSONConfigurationTest.cpp
index 0774566ab..917cc18df 100644
--- a/Util/testsuite/src/JSONConfigurationTest.cpp
+++ b/Util/testsuite/src/JSONConfigurationTest.cpp
@@ -1,8 +1,6 @@
 //
 // JSONConfigurationTest.cpp
 //
-// $Id$
-//
 // Copyright (c) 2004-2012, Applied Informatics Software Engineering GmbH.
 // and Contributors.
 //
diff --git a/Util/testsuite/src/JSONConfigurationTest.h b/Util/testsuite/src/JSONConfigurationTest.h
index 32b16a042..c4e46a8e5 100644
--- a/Util/testsuite/src/JSONConfigurationTest.h
+++ b/Util/testsuite/src/JSONConfigurationTest.h
@@ -1,8 +1,6 @@
 //
 // JSONConfigurationTest.h
 //
-// $Id$
-//
 // Definition of the JSONConfigurationTest class.
 //
 // Copyright (c) 2004-2012, Applied Informatics Software Engineering GmbH.
diff --git a/XML/src/QName.cpp b/XML/src/QName.cpp
index 01b7e13fa..276b1c3fc 100644
--- a/XML/src/QName.cpp
+++ b/XML/src/QName.cpp
@@ -1,8 +1,6 @@
 //
 // QName.cpp
 //
-// $Id$
-//
 // Library: XML
 // Package: XML
 // Module:  QName
diff --git a/XML/src/ValueTraits.cpp b/XML/src/ValueTraits.cpp
index 2e0d48198..c9b5b3efb 100644
--- a/XML/src/ValueTraits.cpp
+++ b/XML/src/ValueTraits.cpp
@@ -1,8 +1,6 @@
 //
 // ValueTraits.cpp
 //
-// $Id$
-//
 // Library: XML
 // Package: XML
 // Module:  ValueTraits
diff --git a/XML/src/XMLStreamParser.cpp b/XML/src/XMLStreamParser.cpp
index befe62a92..52b7d5e39 100644
--- a/XML/src/XMLStreamParser.cpp
+++ b/XML/src/XMLStreamParser.cpp
@@ -1,8 +1,6 @@
 //
 // XMLStreamParser.cpp
 //
-// $Id$
-//
 // Library: XML
 // Package: XML
 // Module:  XMLStreamParser
diff --git a/XML/src/XMLStreamParserException.cpp b/XML/src/XMLStreamParserException.cpp
index e28e5cde5..f09c4b74d 100644
--- a/XML/src/XMLStreamParserException.cpp
+++ b/XML/src/XMLStreamParserException.cpp
@@ -1,8 +1,6 @@
 //
 // XMLStreamParserException.cpp
 //
-// $Id$
-//
 // Library: XML
 // Package: XML
 // Module:  XMLStreamParserException
diff --git a/XML/testsuite/src/XMLStreamParserTest.cpp b/XML/testsuite/src/XMLStreamParserTest.cpp
index 05e8a32f4..ab35dd2dc 100644
--- a/XML/testsuite/src/XMLStreamParserTest.cpp
+++ b/XML/testsuite/src/XMLStreamParserTest.cpp
@@ -1,8 +1,6 @@
 //
 // XMLStreamParserTest.cpp
 //
-// $Id$
-//
 // Copyright (c) 2015, Applied Informatics Software Engineering GmbH.
 // and Contributors.
 //
diff --git a/XML/testsuite/src/XMLStreamParserTest.h b/XML/testsuite/src/XMLStreamParserTest.h
index 2579a74c3..306701e32 100644
--- a/XML/testsuite/src/XMLStreamParserTest.h
+++ b/XML/testsuite/src/XMLStreamParserTest.h
@@ -1,8 +1,6 @@
 //
 // XMLStreamParserTest.h
 //
-// $Id$
-//
 // Definition of the XMLStreamParserTest class.
 //
 // Copyright (c) 2015, Applied Informatics Software Engineering GmbH.