diff --git a/XML/Makefile b/XML/Makefile
index 3855cc734..eb3db368f 100644
--- a/XML/Makefile
+++ b/XML/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/1.3/XML/Makefile#1 $
+# $Id: //poco/Main/XML/Makefile#11 $
 #
 # Makefile for Poco XML
 #
diff --git a/XML/XML.vmsbuild b/XML/XML.vmsbuild
index f5cd1333e..96d433be0 100644
--- a/XML/XML.vmsbuild
+++ b/XML/XML.vmsbuild
@@ -1,7 +1,7 @@
 #
 # XML.vmsbuild
 #
-# $Id: //poco/1.3/XML/XML.vmsbuild#1 $
+# $Id: //poco/Main/XML/XML.vmsbuild#5 $
 #
 DEF=HAVE_EXPAT_CONFIG_H,XML_NS,XML_DTD
 LIB=PocoXML
diff --git a/XML/include/Poco/DOM/AbstractContainerNode.h b/XML/include/Poco/DOM/AbstractContainerNode.h
index 991318051..69fb4cbb9 100644
--- a/XML/include/Poco/DOM/AbstractContainerNode.h
+++ b/XML/include/Poco/DOM/AbstractContainerNode.h
@@ -1,7 +1,7 @@
 //
 // AbstractContainerNode.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/AbstractContainerNode.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/AbstractContainerNode.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/AbstractNode.h b/XML/include/Poco/DOM/AbstractNode.h
index e80f2e218..07b1723f5 100644
--- a/XML/include/Poco/DOM/AbstractNode.h
+++ b/XML/include/Poco/DOM/AbstractNode.h
@@ -1,7 +1,7 @@
 //
 // AbstractNode.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/AbstractNode.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/AbstractNode.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/Attr.h b/XML/include/Poco/DOM/Attr.h
index bcd8fd90f..336739d79 100644
--- a/XML/include/Poco/DOM/Attr.h
+++ b/XML/include/Poco/DOM/Attr.h
@@ -1,7 +1,7 @@
 //
 // Attr.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/Attr.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/Attr.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/AttrMap.h b/XML/include/Poco/DOM/AttrMap.h
index 5ee279a4c..5afe08a05 100644
--- a/XML/include/Poco/DOM/AttrMap.h
+++ b/XML/include/Poco/DOM/AttrMap.h
@@ -1,7 +1,7 @@
 //
 // AttrMap.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/AttrMap.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/AttrMap.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/AutoPtr.h b/XML/include/Poco/DOM/AutoPtr.h
index b51742f45..5828d222a 100644
--- a/XML/include/Poco/DOM/AutoPtr.h
+++ b/XML/include/Poco/DOM/AutoPtr.h
@@ -1,7 +1,7 @@
 //
 // AutoPtr.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/AutoPtr.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/AutoPtr.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/CDATASection.h b/XML/include/Poco/DOM/CDATASection.h
index cc3d59ff5..1905f1cec 100644
--- a/XML/include/Poco/DOM/CDATASection.h
+++ b/XML/include/Poco/DOM/CDATASection.h
@@ -1,7 +1,7 @@
 //
 // CDATASection.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/CDATASection.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/CDATASection.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/CharacterData.h b/XML/include/Poco/DOM/CharacterData.h
index 659a37556..084080a26 100644
--- a/XML/include/Poco/DOM/CharacterData.h
+++ b/XML/include/Poco/DOM/CharacterData.h
@@ -1,7 +1,7 @@
 //
 // CharacterData.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/CharacterData.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/CharacterData.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/ChildNodesList.h b/XML/include/Poco/DOM/ChildNodesList.h
index 74249fb1c..f9c512f81 100644
--- a/XML/include/Poco/DOM/ChildNodesList.h
+++ b/XML/include/Poco/DOM/ChildNodesList.h
@@ -1,7 +1,7 @@
 //
 // ChildNodesList.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/ChildNodesList.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/ChildNodesList.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/Comment.h b/XML/include/Poco/DOM/Comment.h
index 6b88eb947..64c357d03 100644
--- a/XML/include/Poco/DOM/Comment.h
+++ b/XML/include/Poco/DOM/Comment.h
@@ -1,7 +1,7 @@
 //
 // Comment.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/Comment.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/Comment.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/DOMBuilder.h b/XML/include/Poco/DOM/DOMBuilder.h
index 8b8ced523..d0b31f5f3 100644
--- a/XML/include/Poco/DOM/DOMBuilder.h
+++ b/XML/include/Poco/DOM/DOMBuilder.h
@@ -1,7 +1,7 @@
 //
 // DOMBuilder.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/DOMBuilder.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/DOMBuilder.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/DOMException.h b/XML/include/Poco/DOM/DOMException.h
index 55493eb6c..f352d724f 100644
--- a/XML/include/Poco/DOM/DOMException.h
+++ b/XML/include/Poco/DOM/DOMException.h
@@ -1,7 +1,7 @@
 //
 // DOMException.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/DOMException.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/DOMException.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/DOMImplementation.h b/XML/include/Poco/DOM/DOMImplementation.h
index 5488e39da..fd6ed22e4 100644
--- a/XML/include/Poco/DOM/DOMImplementation.h
+++ b/XML/include/Poco/DOM/DOMImplementation.h
@@ -1,7 +1,7 @@
 //
 // DOMImplementation.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/DOMImplementation.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/DOMImplementation.h#3 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/DOMObject.h b/XML/include/Poco/DOM/DOMObject.h
index f73dd5c51..e80c811a9 100644
--- a/XML/include/Poco/DOM/DOMObject.h
+++ b/XML/include/Poco/DOM/DOMObject.h
@@ -1,7 +1,7 @@
 //
 // DOMObject.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/DOMObject.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/DOMObject.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/DOMParser.h b/XML/include/Poco/DOM/DOMParser.h
index 42fba6f88..47bd74bff 100644
--- a/XML/include/Poco/DOM/DOMParser.h
+++ b/XML/include/Poco/DOM/DOMParser.h
@@ -1,7 +1,7 @@
 //
 // DOMParser.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/DOMParser.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/DOMParser.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/DOMSerializer.h b/XML/include/Poco/DOM/DOMSerializer.h
index 3f693742d..d36e87541 100644
--- a/XML/include/Poco/DOM/DOMSerializer.h
+++ b/XML/include/Poco/DOM/DOMSerializer.h
@@ -1,7 +1,7 @@
 //
 // DOMSerializer.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/DOMSerializer.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/DOMSerializer.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/DOMWriter.h b/XML/include/Poco/DOM/DOMWriter.h
index 24ea26649..20f8abeca 100644
--- a/XML/include/Poco/DOM/DOMWriter.h
+++ b/XML/include/Poco/DOM/DOMWriter.h
@@ -1,7 +1,7 @@
 //
 // DOMWriter.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/DOMWriter.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/DOMWriter.h#3 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/DTDMap.h b/XML/include/Poco/DOM/DTDMap.h
index c6d37d4a1..d1598ab28 100644
--- a/XML/include/Poco/DOM/DTDMap.h
+++ b/XML/include/Poco/DOM/DTDMap.h
@@ -1,7 +1,7 @@
 //
 // DTDMap.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/DTDMap.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/DTDMap.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/Document.h b/XML/include/Poco/DOM/Document.h
index 0363ed0b5..ce62cd399 100644
--- a/XML/include/Poco/DOM/Document.h
+++ b/XML/include/Poco/DOM/Document.h
@@ -1,7 +1,7 @@
 //
 // Document.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/Document.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/Document.h#3 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/DocumentEvent.h b/XML/include/Poco/DOM/DocumentEvent.h
index 20836fca8..4f98b6bbc 100644
--- a/XML/include/Poco/DOM/DocumentEvent.h
+++ b/XML/include/Poco/DOM/DocumentEvent.h
@@ -1,7 +1,7 @@
 //
 // DocumentEvent.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/DocumentEvent.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/DocumentEvent.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/DocumentFragment.h b/XML/include/Poco/DOM/DocumentFragment.h
index a7bb87faf..7b5131fdd 100644
--- a/XML/include/Poco/DOM/DocumentFragment.h
+++ b/XML/include/Poco/DOM/DocumentFragment.h
@@ -1,7 +1,7 @@
 //
 // DocumentFragment.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/DocumentFragment.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/DocumentFragment.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/DocumentType.h b/XML/include/Poco/DOM/DocumentType.h
index 3faec54a6..940b78f18 100644
--- a/XML/include/Poco/DOM/DocumentType.h
+++ b/XML/include/Poco/DOM/DocumentType.h
@@ -1,7 +1,7 @@
 //
 // DocumentType.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/DocumentType.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/DocumentType.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/Element.h b/XML/include/Poco/DOM/Element.h
index 5a6042acf..2a1dd943d 100644
--- a/XML/include/Poco/DOM/Element.h
+++ b/XML/include/Poco/DOM/Element.h
@@ -1,7 +1,7 @@
 //
 // Element.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/Element.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/Element.h#3 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/ElementsByTagNameList.h b/XML/include/Poco/DOM/ElementsByTagNameList.h
index 75eaea1e3..d42546fc5 100644
--- a/XML/include/Poco/DOM/ElementsByTagNameList.h
+++ b/XML/include/Poco/DOM/ElementsByTagNameList.h
@@ -1,7 +1,7 @@
 //
 // ElementsByTagNameList.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/ElementsByTagNameList.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/ElementsByTagNameList.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/Entity.h b/XML/include/Poco/DOM/Entity.h
index 27011bfad..7ef2af48e 100644
--- a/XML/include/Poco/DOM/Entity.h
+++ b/XML/include/Poco/DOM/Entity.h
@@ -1,7 +1,7 @@
 //
 // Entity.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/Entity.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/Entity.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/EntityReference.h b/XML/include/Poco/DOM/EntityReference.h
index 29392b51b..b62a2c3ac 100644
--- a/XML/include/Poco/DOM/EntityReference.h
+++ b/XML/include/Poco/DOM/EntityReference.h
@@ -1,7 +1,7 @@
 //
 // EntityReference.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/EntityReference.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/EntityReference.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/Event.h b/XML/include/Poco/DOM/Event.h
index da5acc407..df79a81c2 100644
--- a/XML/include/Poco/DOM/Event.h
+++ b/XML/include/Poco/DOM/Event.h
@@ -1,7 +1,7 @@
 //
 // Event.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/Event.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/Event.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/EventDispatcher.h b/XML/include/Poco/DOM/EventDispatcher.h
index ebfaa058d..d920c8bb0 100644
--- a/XML/include/Poco/DOM/EventDispatcher.h
+++ b/XML/include/Poco/DOM/EventDispatcher.h
@@ -1,7 +1,7 @@
 //
 // EventDispatcher.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/EventDispatcher.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/EventDispatcher.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/EventException.h b/XML/include/Poco/DOM/EventException.h
index 4ad7b494e..336ed9b61 100644
--- a/XML/include/Poco/DOM/EventException.h
+++ b/XML/include/Poco/DOM/EventException.h
@@ -1,7 +1,7 @@
 //
 // EventException.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/EventException.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/EventException.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/EventListener.h b/XML/include/Poco/DOM/EventListener.h
index 7df0209e7..96bcc1bd9 100644
--- a/XML/include/Poco/DOM/EventListener.h
+++ b/XML/include/Poco/DOM/EventListener.h
@@ -1,7 +1,7 @@
 //
 // EventListener.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/EventListener.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/EventListener.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/EventTarget.h b/XML/include/Poco/DOM/EventTarget.h
index 4054d513f..779c8ce77 100644
--- a/XML/include/Poco/DOM/EventTarget.h
+++ b/XML/include/Poco/DOM/EventTarget.h
@@ -1,7 +1,7 @@
 //
 // EventTarget.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/EventTarget.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/EventTarget.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/MutationEvent.h b/XML/include/Poco/DOM/MutationEvent.h
index 1320f8ff0..1c5809999 100644
--- a/XML/include/Poco/DOM/MutationEvent.h
+++ b/XML/include/Poco/DOM/MutationEvent.h
@@ -1,7 +1,7 @@
 //
 // MutationEvent.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/MutationEvent.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/MutationEvent.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/NamedNodeMap.h b/XML/include/Poco/DOM/NamedNodeMap.h
index ea36beff1..e34fd7fab 100644
--- a/XML/include/Poco/DOM/NamedNodeMap.h
+++ b/XML/include/Poco/DOM/NamedNodeMap.h
@@ -1,7 +1,7 @@
 //
 // NamedNodeMap.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/NamedNodeMap.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/NamedNodeMap.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/Node.h b/XML/include/Poco/DOM/Node.h
index 994f8b2f9..232536584 100644
--- a/XML/include/Poco/DOM/Node.h
+++ b/XML/include/Poco/DOM/Node.h
@@ -1,7 +1,7 @@
 //
 // Node.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/Node.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/Node.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/NodeFilter.h b/XML/include/Poco/DOM/NodeFilter.h
index b6484231a..a21580904 100644
--- a/XML/include/Poco/DOM/NodeFilter.h
+++ b/XML/include/Poco/DOM/NodeFilter.h
@@ -1,7 +1,7 @@
 //
 // NodeFilter.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/NodeFilter.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/NodeFilter.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/NodeIterator.h b/XML/include/Poco/DOM/NodeIterator.h
index cf2702a33..77d13acb5 100644
--- a/XML/include/Poco/DOM/NodeIterator.h
+++ b/XML/include/Poco/DOM/NodeIterator.h
@@ -1,7 +1,7 @@
 //
 // NodeIterator.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/NodeIterator.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/NodeIterator.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/NodeList.h b/XML/include/Poco/DOM/NodeList.h
index 621e4af9d..6aefb3e34 100644
--- a/XML/include/Poco/DOM/NodeList.h
+++ b/XML/include/Poco/DOM/NodeList.h
@@ -1,7 +1,7 @@
 //
 // NodeList.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/NodeList.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/NodeList.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/Notation.h b/XML/include/Poco/DOM/Notation.h
index cacc7112c..368de9079 100644
--- a/XML/include/Poco/DOM/Notation.h
+++ b/XML/include/Poco/DOM/Notation.h
@@ -1,7 +1,7 @@
 //
 // Notation.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/Notation.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/Notation.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/ProcessingInstruction.h b/XML/include/Poco/DOM/ProcessingInstruction.h
index 76e57b5a1..97b2ba678 100644
--- a/XML/include/Poco/DOM/ProcessingInstruction.h
+++ b/XML/include/Poco/DOM/ProcessingInstruction.h
@@ -1,7 +1,7 @@
 //
 // ProcessingInstruction.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/ProcessingInstruction.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/ProcessingInstruction.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/Text.h b/XML/include/Poco/DOM/Text.h
index 4f893e346..3911f51f7 100644
--- a/XML/include/Poco/DOM/Text.h
+++ b/XML/include/Poco/DOM/Text.h
@@ -1,7 +1,7 @@
 //
 // Text.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/Text.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/Text.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/DOM/TreeWalker.h b/XML/include/Poco/DOM/TreeWalker.h
index 02921628f..bc0a47a5d 100644
--- a/XML/include/Poco/DOM/TreeWalker.h
+++ b/XML/include/Poco/DOM/TreeWalker.h
@@ -1,7 +1,7 @@
 //
 // TreeWalker.h
 //
-// $Id: //poco/1.3/XML/include/Poco/DOM/TreeWalker.h#1 $
+// $Id: //poco/Main/XML/include/Poco/DOM/TreeWalker.h#2 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/include/Poco/SAX/Attributes.h b/XML/include/Poco/SAX/Attributes.h
index d292cd34f..e3cfee035 100644
--- a/XML/include/Poco/SAX/Attributes.h
+++ b/XML/include/Poco/SAX/Attributes.h
@@ -1,7 +1,7 @@
 //
 // Attributes.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/Attributes.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/Attributes.h#2 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/SAX/AttributesImpl.h b/XML/include/Poco/SAX/AttributesImpl.h
index 12f61b4df..352fa95a4 100644
--- a/XML/include/Poco/SAX/AttributesImpl.h
+++ b/XML/include/Poco/SAX/AttributesImpl.h
@@ -1,7 +1,7 @@
 //
 // AttributesImpl.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/AttributesImpl.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/AttributesImpl.h#2 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/SAX/ContentHandler.h b/XML/include/Poco/SAX/ContentHandler.h
index 83903bd82..5d46e056f 100644
--- a/XML/include/Poco/SAX/ContentHandler.h
+++ b/XML/include/Poco/SAX/ContentHandler.h
@@ -1,7 +1,7 @@
 //
 // ContentHandler.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/ContentHandler.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/ContentHandler.h#2 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/SAX/DTDHandler.h b/XML/include/Poco/SAX/DTDHandler.h
index 962fcdbbf..db1107464 100644
--- a/XML/include/Poco/SAX/DTDHandler.h
+++ b/XML/include/Poco/SAX/DTDHandler.h
@@ -1,7 +1,7 @@
 //
 // DTDHandler.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/DTDHandler.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/DTDHandler.h#2 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/SAX/DeclHandler.h b/XML/include/Poco/SAX/DeclHandler.h
index 9760de8e5..aeb0dbe27 100644
--- a/XML/include/Poco/SAX/DeclHandler.h
+++ b/XML/include/Poco/SAX/DeclHandler.h
@@ -1,7 +1,7 @@
 //
 // DeclHandler.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/DeclHandler.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/DeclHandler.h#2 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/SAX/DefaultHandler.h b/XML/include/Poco/SAX/DefaultHandler.h
index e73982b1d..349f757bf 100644
--- a/XML/include/Poco/SAX/DefaultHandler.h
+++ b/XML/include/Poco/SAX/DefaultHandler.h
@@ -1,7 +1,7 @@
 //
 // DefaultHandler.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/DefaultHandler.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/DefaultHandler.h#2 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/SAX/EntityResolver.h b/XML/include/Poco/SAX/EntityResolver.h
index 088f0de29..25d90e647 100644
--- a/XML/include/Poco/SAX/EntityResolver.h
+++ b/XML/include/Poco/SAX/EntityResolver.h
@@ -1,7 +1,7 @@
 //
 // EntityResolver.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/EntityResolver.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/EntityResolver.h#2 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/SAX/EntityResolverImpl.h b/XML/include/Poco/SAX/EntityResolverImpl.h
index 4ffb6fd2d..4223e1290 100644
--- a/XML/include/Poco/SAX/EntityResolverImpl.h
+++ b/XML/include/Poco/SAX/EntityResolverImpl.h
@@ -1,7 +1,7 @@
 //
 // EntityResolverImpl.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/EntityResolverImpl.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/EntityResolverImpl.h#2 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/SAX/ErrorHandler.h b/XML/include/Poco/SAX/ErrorHandler.h
index 059625c0b..83fbb8ae0 100644
--- a/XML/include/Poco/SAX/ErrorHandler.h
+++ b/XML/include/Poco/SAX/ErrorHandler.h
@@ -1,7 +1,7 @@
 //
 // ErrorHandler.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/ErrorHandler.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/ErrorHandler.h#2 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/SAX/InputSource.h b/XML/include/Poco/SAX/InputSource.h
index f9b4b7744..547c73267 100644
--- a/XML/include/Poco/SAX/InputSource.h
+++ b/XML/include/Poco/SAX/InputSource.h
@@ -1,7 +1,7 @@
 //
 // InputSource.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/InputSource.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/InputSource.h#2 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/SAX/LexicalHandler.h b/XML/include/Poco/SAX/LexicalHandler.h
index 6459c91c9..32b3af5b7 100644
--- a/XML/include/Poco/SAX/LexicalHandler.h
+++ b/XML/include/Poco/SAX/LexicalHandler.h
@@ -1,7 +1,7 @@
 //
 // LexicalHandler.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/LexicalHandler.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/LexicalHandler.h#2 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/SAX/Locator.h b/XML/include/Poco/SAX/Locator.h
index a72e9c3b9..e1d9d45c6 100644
--- a/XML/include/Poco/SAX/Locator.h
+++ b/XML/include/Poco/SAX/Locator.h
@@ -1,7 +1,7 @@
 //
 // Locator.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/Locator.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/Locator.h#2 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/SAX/LocatorImpl.h b/XML/include/Poco/SAX/LocatorImpl.h
index 87b8f2763..109a672dc 100644
--- a/XML/include/Poco/SAX/LocatorImpl.h
+++ b/XML/include/Poco/SAX/LocatorImpl.h
@@ -1,7 +1,7 @@
 //
 // LocatorImpl.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/LocatorImpl.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/LocatorImpl.h#2 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/SAX/NamespaceSupport.h b/XML/include/Poco/SAX/NamespaceSupport.h
index 4470ba5a9..3896ec563 100644
--- a/XML/include/Poco/SAX/NamespaceSupport.h
+++ b/XML/include/Poco/SAX/NamespaceSupport.h
@@ -1,7 +1,7 @@
 //
 // NamespaceSupport.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/NamespaceSupport.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/NamespaceSupport.h#2 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/SAX/SAXException.h b/XML/include/Poco/SAX/SAXException.h
index 093bf73f8..498536bc9 100644
--- a/XML/include/Poco/SAX/SAXException.h
+++ b/XML/include/Poco/SAX/SAXException.h
@@ -1,7 +1,7 @@
 //
 // SAXException.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/SAXException.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/SAXException.h#2 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/SAX/SAXParser.h b/XML/include/Poco/SAX/SAXParser.h
index bc31f2c2d..c8c077b30 100644
--- a/XML/include/Poco/SAX/SAXParser.h
+++ b/XML/include/Poco/SAX/SAXParser.h
@@ -1,7 +1,7 @@
 //
 // SAXParser.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/SAXParser.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/SAXParser.h#3 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/SAX/WhitespaceFilter.h b/XML/include/Poco/SAX/WhitespaceFilter.h
index 3b58bf88b..ae286ba84 100644
--- a/XML/include/Poco/SAX/WhitespaceFilter.h
+++ b/XML/include/Poco/SAX/WhitespaceFilter.h
@@ -1,7 +1,7 @@
 //
 // WhitespaceFilter.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/WhitespaceFilter.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/WhitespaceFilter.h#2 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/SAX/XMLFilter.h b/XML/include/Poco/SAX/XMLFilter.h
index 9a37e88f1..56e3946f2 100644
--- a/XML/include/Poco/SAX/XMLFilter.h
+++ b/XML/include/Poco/SAX/XMLFilter.h
@@ -1,7 +1,7 @@
 //
 // XMLFilter.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/XMLFilter.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/XMLFilter.h#2 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/SAX/XMLFilterImpl.h b/XML/include/Poco/SAX/XMLFilterImpl.h
index 797782a15..ab8f24105 100644
--- a/XML/include/Poco/SAX/XMLFilterImpl.h
+++ b/XML/include/Poco/SAX/XMLFilterImpl.h
@@ -1,7 +1,7 @@
 //
 // XMLFilterImpl.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/XMLFilterImpl.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/XMLFilterImpl.h#2 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/SAX/XMLReader.h b/XML/include/Poco/SAX/XMLReader.h
index eaf77ac9f..00df28eaa 100644
--- a/XML/include/Poco/SAX/XMLReader.h
+++ b/XML/include/Poco/SAX/XMLReader.h
@@ -1,7 +1,7 @@
 //
 // XMLReader.h
 //
-// $Id: //poco/1.3/XML/include/Poco/SAX/XMLReader.h#1 $
+// $Id: //poco/Main/XML/include/Poco/SAX/XMLReader.h#2 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/include/Poco/XML/Name.h b/XML/include/Poco/XML/Name.h
index 42ba994d4..f042fe7bf 100644
--- a/XML/include/Poco/XML/Name.h
+++ b/XML/include/Poco/XML/Name.h
@@ -1,7 +1,7 @@
 //
 // Name.h
 //
-// $Id: //poco/1.3/XML/include/Poco/XML/Name.h#1 $
+// $Id: //poco/Main/XML/include/Poco/XML/Name.h#2 $
 //
 // Library: XML
 // Package: XML
diff --git a/XML/include/Poco/XML/NamePool.h b/XML/include/Poco/XML/NamePool.h
index 8dc61aec7..30990fa89 100644
--- a/XML/include/Poco/XML/NamePool.h
+++ b/XML/include/Poco/XML/NamePool.h
@@ -1,7 +1,7 @@
 //
 // NamePool.h
 //
-// $Id: //poco/1.3/XML/include/Poco/XML/NamePool.h#1 $
+// $Id: //poco/Main/XML/include/Poco/XML/NamePool.h#2 $
 //
 // Library: XML
 // Package: XML
diff --git a/XML/include/Poco/XML/NamespaceStrategy.h b/XML/include/Poco/XML/NamespaceStrategy.h
index f5b9a0c3e..488ae38e7 100644
--- a/XML/include/Poco/XML/NamespaceStrategy.h
+++ b/XML/include/Poco/XML/NamespaceStrategy.h
@@ -1,7 +1,7 @@
 //
 // NamespaceStrategy.h
 //
-// $Id: //poco/1.3/XML/include/Poco/XML/NamespaceStrategy.h#1 $
+// $Id: //poco/Main/XML/include/Poco/XML/NamespaceStrategy.h#2 $
 //
 // Library: XML
 // Package: XML
diff --git a/XML/include/Poco/XML/ParserEngine.h b/XML/include/Poco/XML/ParserEngine.h
index 1491cc975..5a4642181 100644
--- a/XML/include/Poco/XML/ParserEngine.h
+++ b/XML/include/Poco/XML/ParserEngine.h
@@ -1,7 +1,7 @@
 //
 // ParserEngine.h
 //
-// $Id: //poco/1.3/XML/include/Poco/XML/ParserEngine.h#1 $
+// $Id: //poco/Main/XML/include/Poco/XML/ParserEngine.h#2 $
 //
 // Library: XML
 // Package: XML
diff --git a/XML/include/Poco/XML/XML.h b/XML/include/Poco/XML/XML.h
index c7c0267a5..5d30e881e 100644
--- a/XML/include/Poco/XML/XML.h
+++ b/XML/include/Poco/XML/XML.h
@@ -1,7 +1,7 @@
 //
 // XML.h
 //
-// $Id: //poco/1.3/XML/include/Poco/XML/XML.h#1 $
+// $Id: //poco/Main/XML/include/Poco/XML/XML.h#2 $
 //
 // Library: XML
 // Package: XML
diff --git a/XML/include/Poco/XML/XMLException.h b/XML/include/Poco/XML/XMLException.h
index 94ae32b9f..3a5cb4928 100644
--- a/XML/include/Poco/XML/XMLException.h
+++ b/XML/include/Poco/XML/XMLException.h
@@ -1,7 +1,7 @@
 //
 // XMLException.h
 //
-// $Id: //poco/1.3/XML/include/Poco/XML/XMLException.h#1 $
+// $Id: //poco/Main/XML/include/Poco/XML/XMLException.h#2 $
 //
 // Library: XML
 // Package: XML
diff --git a/XML/include/Poco/XML/XMLStream.h b/XML/include/Poco/XML/XMLStream.h
index 789728787..aea20c4c5 100644
--- a/XML/include/Poco/XML/XMLStream.h
+++ b/XML/include/Poco/XML/XMLStream.h
@@ -1,7 +1,7 @@
 //
 // XMLStream.h
 //
-// $Id: //poco/1.3/XML/include/Poco/XML/XMLStream.h#1 $
+// $Id: //poco/Main/XML/include/Poco/XML/XMLStream.h#2 $
 //
 // Library: XML
 // Package: XML
diff --git a/XML/include/Poco/XML/XMLString.h b/XML/include/Poco/XML/XMLString.h
index 4e083bbb7..1eb875aca 100644
--- a/XML/include/Poco/XML/XMLString.h
+++ b/XML/include/Poco/XML/XMLString.h
@@ -1,7 +1,7 @@
 //
 // XMLString.h
 //
-// $Id: //poco/1.3/XML/include/Poco/XML/XMLString.h#1 $
+// $Id: //poco/Main/XML/include/Poco/XML/XMLString.h#2 $
 //
 // Library: XML
 // Package: XML
diff --git a/XML/include/Poco/XML/XMLWriter.h b/XML/include/Poco/XML/XMLWriter.h
index 3846824b7..7c92009be 100644
--- a/XML/include/Poco/XML/XMLWriter.h
+++ b/XML/include/Poco/XML/XMLWriter.h
@@ -1,7 +1,7 @@
 //
 // XMLWriter.h
 //
-// $Id: //poco/1.3/XML/include/Poco/XML/XMLWriter.h#1 $
+// $Id: //poco/Main/XML/include/Poco/XML/XMLWriter.h#2 $
 //
 // Library: XML
 // Package: XML
diff --git a/XML/samples/DOMParser/DOMParser.vmsbuild b/XML/samples/DOMParser/DOMParser.vmsbuild
index f0277bcf2..a5f7dda2e 100644
--- a/XML/samples/DOMParser/DOMParser.vmsbuild
+++ b/XML/samples/DOMParser/DOMParser.vmsbuild
@@ -1,7 +1,7 @@
 #
 # sample.vmsbuild
 #
-# $Id: //poco/1.3/XML/samples/DOMParser/DOMParser.vmsbuild#1 $
+# $Id: //poco/Main/XML/samples/DOMParser/DOMParser.vmsbuild#5 $
 #
 EXE=DOMParser
 DOMParser
diff --git a/XML/samples/DOMParser/Makefile b/XML/samples/DOMParser/Makefile
index 53d53a6cb..fe491131d 100644
--- a/XML/samples/DOMParser/Makefile
+++ b/XML/samples/DOMParser/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/1.3/XML/samples/DOMParser/Makefile#1 $
+# $Id: //poco/Main/XML/samples/DOMParser/Makefile#6 $
 #
 # Makefile for Poco DOMParser
 #
diff --git a/XML/samples/DOMParser/src/DOMParser.cpp b/XML/samples/DOMParser/src/DOMParser.cpp
index a80eef1d2..a7f23cfaa 100644
--- a/XML/samples/DOMParser/src/DOMParser.cpp
+++ b/XML/samples/DOMParser/src/DOMParser.cpp
@@ -1,7 +1,7 @@
 //
 // DOMParser.cpp
 //
-// $Id: //poco/1.3/XML/samples/DOMParser/src/DOMParser.cpp#1 $
+// $Id: //poco/Main/XML/samples/DOMParser/src/DOMParser.cpp#9 $
 //
 // This sample demonstrates the DOMParser, AutoPtr and
 // NodeIterator classes.
diff --git a/XML/samples/DOMWriter/DOMWriter.vmsbuild b/XML/samples/DOMWriter/DOMWriter.vmsbuild
index 2eade9e1f..b717db658 100644
--- a/XML/samples/DOMWriter/DOMWriter.vmsbuild
+++ b/XML/samples/DOMWriter/DOMWriter.vmsbuild
@@ -1,7 +1,7 @@
 #
 # sample.vmsbuild
 #
-# $Id: //poco/1.3/XML/samples/DOMWriter/DOMWriter.vmsbuild#1 $
+# $Id: //poco/Main/XML/samples/DOMWriter/DOMWriter.vmsbuild#5 $
 #
 EXE=DOMWriter
 DOMWriter
diff --git a/XML/samples/DOMWriter/Makefile b/XML/samples/DOMWriter/Makefile
index 6b734dac0..5edd0f3bd 100644
--- a/XML/samples/DOMWriter/Makefile
+++ b/XML/samples/DOMWriter/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/1.3/XML/samples/DOMWriter/Makefile#1 $
+# $Id: //poco/Main/XML/samples/DOMWriter/Makefile#6 $
 #
 # Makefile for Poco DOMWriter
 #
diff --git a/XML/samples/DOMWriter/src/DOMWriter.cpp b/XML/samples/DOMWriter/src/DOMWriter.cpp
index afa2ab63c..cf06b2fc7 100644
--- a/XML/samples/DOMWriter/src/DOMWriter.cpp
+++ b/XML/samples/DOMWriter/src/DOMWriter.cpp
@@ -1,7 +1,7 @@
 //
 // DOMWriter.cpp
 //
-// $Id: //poco/1.3/XML/samples/DOMWriter/src/DOMWriter.cpp#1 $
+// $Id: //poco/Main/XML/samples/DOMWriter/src/DOMWriter.cpp#10 $
 //
 // This sample demonstrates the DOMWriter class and how to
 // build DOM documents in memory.
diff --git a/XML/samples/Makefile b/XML/samples/Makefile
index 6cac89805..6b4607792 100644
--- a/XML/samples/Makefile
+++ b/XML/samples/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/1.3/XML/samples/Makefile#1 $
+# $Id: //poco/Main/XML/samples/Makefile#6 $
 #
 # Makefile for Poco XML Samples
 #
diff --git a/XML/samples/PrettyPrint/Makefile b/XML/samples/PrettyPrint/Makefile
index 5953400a0..029caed8c 100644
--- a/XML/samples/PrettyPrint/Makefile
+++ b/XML/samples/PrettyPrint/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/1.3/XML/samples/PrettyPrint/Makefile#1 $
+# $Id: //poco/Main/XML/samples/PrettyPrint/Makefile#6 $
 #
 # Makefile for Poco PrettyPrint
 #
diff --git a/XML/samples/PrettyPrint/PrettyPrint.vmsbuild b/XML/samples/PrettyPrint/PrettyPrint.vmsbuild
index c49a884d7..020b3aec3 100644
--- a/XML/samples/PrettyPrint/PrettyPrint.vmsbuild
+++ b/XML/samples/PrettyPrint/PrettyPrint.vmsbuild
@@ -1,7 +1,7 @@
 #
 # sample.vmsbuild
 #
-# $Id: //poco/1.3/XML/samples/PrettyPrint/PrettyPrint.vmsbuild#1 $
+# $Id: //poco/Main/XML/samples/PrettyPrint/PrettyPrint.vmsbuild#5 $
 #
 EXE=PrettyPrint
 PrettyPrint
diff --git a/XML/samples/PrettyPrint/src/PrettyPrint.cpp b/XML/samples/PrettyPrint/src/PrettyPrint.cpp
index fc0bd3789..3f74a2b64 100644
--- a/XML/samples/PrettyPrint/src/PrettyPrint.cpp
+++ b/XML/samples/PrettyPrint/src/PrettyPrint.cpp
@@ -1,7 +1,7 @@
 //
 // PrettyPrint.cpp
 //
-// $Id: //poco/1.3/XML/samples/PrettyPrint/src/PrettyPrint.cpp#1 $
+// $Id: //poco/Main/XML/samples/PrettyPrint/src/PrettyPrint.cpp#9 $
 //
 // This sample demonstrates the SAXParser, WhitespaceFilter,
 // InputSource and XMLWriter classes.
diff --git a/XML/samples/SAXParser/Makefile b/XML/samples/SAXParser/Makefile
index 3f22c6a5b..e6c521659 100644
--- a/XML/samples/SAXParser/Makefile
+++ b/XML/samples/SAXParser/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/1.3/XML/samples/SAXParser/Makefile#1 $
+# $Id: //poco/Main/XML/samples/SAXParser/Makefile#6 $
 #
 # Makefile for Poco SAXParser
 #
diff --git a/XML/samples/SAXParser/SAXParser.vmsbuild b/XML/samples/SAXParser/SAXParser.vmsbuild
index a7ae48fdb..e17ca9951 100644
--- a/XML/samples/SAXParser/SAXParser.vmsbuild
+++ b/XML/samples/SAXParser/SAXParser.vmsbuild
@@ -1,7 +1,7 @@
 #
 # sample.vmsbuild
 #
-# $Id: //poco/1.3/XML/samples/SAXParser/SAXParser.vmsbuild#1 $
+# $Id: //poco/Main/XML/samples/SAXParser/SAXParser.vmsbuild#5 $
 #
 EXE=SAXParser
 SAXParser
diff --git a/XML/samples/SAXParser/src/SAXParser.cpp b/XML/samples/SAXParser/src/SAXParser.cpp
index e4844c990..3e3756375 100644
--- a/XML/samples/SAXParser/src/SAXParser.cpp
+++ b/XML/samples/SAXParser/src/SAXParser.cpp
@@ -1,7 +1,7 @@
 //
 // SAXParser.cpp
 //
-// $Id: //poco/1.3/XML/samples/SAXParser/src/SAXParser.cpp#1 $
+// $Id: //poco/Main/XML/samples/SAXParser/src/SAXParser.cpp#9 $
 //
 // This sample demonstrates the SAXParser class.
 //
diff --git a/XML/src/AbstractContainerNode.cpp b/XML/src/AbstractContainerNode.cpp
index 00960304b..b38635263 100644
--- a/XML/src/AbstractContainerNode.cpp
+++ b/XML/src/AbstractContainerNode.cpp
@@ -1,7 +1,7 @@
 //
 // AbstractContainerNode.cpp
 //
-// $Id: //poco/1.3/XML/src/AbstractContainerNode.cpp#1 $
+// $Id: //poco/Main/XML/src/AbstractContainerNode.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/AbstractNode.cpp b/XML/src/AbstractNode.cpp
index dde4ae59e..dc5ae7104 100644
--- a/XML/src/AbstractNode.cpp
+++ b/XML/src/AbstractNode.cpp
@@ -1,7 +1,7 @@
 //
 // AbstractNode.cpp
 //
-// $Id: //poco/1.3/XML/src/AbstractNode.cpp#1 $
+// $Id: //poco/Main/XML/src/AbstractNode.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/Attr.cpp b/XML/src/Attr.cpp
index bb679aeb3..2217849da 100644
--- a/XML/src/Attr.cpp
+++ b/XML/src/Attr.cpp
@@ -1,7 +1,7 @@
 //
 // Attr.cpp
 //
-// $Id: //poco/1.3/XML/src/Attr.cpp#1 $
+// $Id: //poco/Main/XML/src/Attr.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/AttrMap.cpp b/XML/src/AttrMap.cpp
index 0ce4b4848..6cdef4e05 100644
--- a/XML/src/AttrMap.cpp
+++ b/XML/src/AttrMap.cpp
@@ -1,7 +1,7 @@
 //
 // AttrMap.cpp
 //
-// $Id: //poco/1.3/XML/src/AttrMap.cpp#1 $
+// $Id: //poco/Main/XML/src/AttrMap.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/Attributes.cpp b/XML/src/Attributes.cpp
index f6475d4cb..0e72e4312 100644
--- a/XML/src/Attributes.cpp
+++ b/XML/src/Attributes.cpp
@@ -1,7 +1,7 @@
 //
 // Attributes.cpp
 //
-// $Id: //poco/1.3/XML/src/Attributes.cpp#1 $
+// $Id: //poco/Main/XML/src/Attributes.cpp#10 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/src/AttributesImpl.cpp b/XML/src/AttributesImpl.cpp
index eec6c7b74..9a268c107 100644
--- a/XML/src/AttributesImpl.cpp
+++ b/XML/src/AttributesImpl.cpp
@@ -1,7 +1,7 @@
 //
 // AttributesImpl.cpp
 //
-// $Id: //poco/1.3/XML/src/AttributesImpl.cpp#1 $
+// $Id: //poco/Main/XML/src/AttributesImpl.cpp#11 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/src/CDATASection.cpp b/XML/src/CDATASection.cpp
index 2b307e1de..ce17953b8 100644
--- a/XML/src/CDATASection.cpp
+++ b/XML/src/CDATASection.cpp
@@ -1,7 +1,7 @@
 //
 // CDATASection.cpp
 //
-// $Id: //poco/1.3/XML/src/CDATASection.cpp#1 $
+// $Id: //poco/Main/XML/src/CDATASection.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/CharacterData.cpp b/XML/src/CharacterData.cpp
index a8a3f4caa..b8abf2993 100644
--- a/XML/src/CharacterData.cpp
+++ b/XML/src/CharacterData.cpp
@@ -1,7 +1,7 @@
 //
 // CharacterData.cpp
 //
-// $Id: //poco/1.3/XML/src/CharacterData.cpp#1 $
+// $Id: //poco/Main/XML/src/CharacterData.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/ChildNodesList.cpp b/XML/src/ChildNodesList.cpp
index 44eea4df3..4ac6c5eee 100644
--- a/XML/src/ChildNodesList.cpp
+++ b/XML/src/ChildNodesList.cpp
@@ -1,7 +1,7 @@
 //
 // ChildNodesList.cpp
 //
-// $Id: //poco/1.3/XML/src/ChildNodesList.cpp#1 $
+// $Id: //poco/Main/XML/src/ChildNodesList.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/Comment.cpp b/XML/src/Comment.cpp
index 458cf0cbc..c2d37c527 100644
--- a/XML/src/Comment.cpp
+++ b/XML/src/Comment.cpp
@@ -1,7 +1,7 @@
 //
 // Comment.cpp
 //
-// $Id: //poco/1.3/XML/src/Comment.cpp#1 $
+// $Id: //poco/Main/XML/src/Comment.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/ContentHandler.cpp b/XML/src/ContentHandler.cpp
index 979d0ecb7..3809c63ee 100644
--- a/XML/src/ContentHandler.cpp
+++ b/XML/src/ContentHandler.cpp
@@ -1,7 +1,7 @@
 //
 // ContentHandler.cpp
 //
-// $Id: //poco/1.3/XML/src/ContentHandler.cpp#1 $
+// $Id: //poco/Main/XML/src/ContentHandler.cpp#10 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/src/DOMBuilder.cpp b/XML/src/DOMBuilder.cpp
index c1c3307a6..a0ebcb3fa 100644
--- a/XML/src/DOMBuilder.cpp
+++ b/XML/src/DOMBuilder.cpp
@@ -1,7 +1,7 @@
 //
 // DOMBuilder.cpp
 //
-// $Id: //poco/1.3/XML/src/DOMBuilder.cpp#1 $
+// $Id: //poco/Main/XML/src/DOMBuilder.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/DOMException.cpp b/XML/src/DOMException.cpp
index 09eed4309..96d94e948 100644
--- a/XML/src/DOMException.cpp
+++ b/XML/src/DOMException.cpp
@@ -1,7 +1,7 @@
 //
 // DOMException.cpp
 //
-// $Id: //poco/1.3/XML/src/DOMException.cpp#1 $
+// $Id: //poco/Main/XML/src/DOMException.cpp#11 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/DOMImplementation.cpp b/XML/src/DOMImplementation.cpp
index e57c3a5dd..1b6c60b16 100644
--- a/XML/src/DOMImplementation.cpp
+++ b/XML/src/DOMImplementation.cpp
@@ -1,7 +1,7 @@
 //
 // DOMImplementation.cpp
 //
-// $Id: //poco/1.3/XML/src/DOMImplementation.cpp#1 $
+// $Id: //poco/Main/XML/src/DOMImplementation.cpp#11 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/DOMObject.cpp b/XML/src/DOMObject.cpp
index a3c47c985..5c16a517c 100644
--- a/XML/src/DOMObject.cpp
+++ b/XML/src/DOMObject.cpp
@@ -1,7 +1,7 @@
 //
 // DOMObject.cpp
 //
-// $Id: //poco/1.3/XML/src/DOMObject.cpp#1 $
+// $Id: //poco/Main/XML/src/DOMObject.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/DOMParser.cpp b/XML/src/DOMParser.cpp
index 035e30453..7fc4b1928 100644
--- a/XML/src/DOMParser.cpp
+++ b/XML/src/DOMParser.cpp
@@ -1,7 +1,7 @@
 //
 // DOMParser.cpp
 //
-// $Id: //poco/1.3/XML/src/DOMParser.cpp#1 $
+// $Id: //poco/Main/XML/src/DOMParser.cpp#11 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/DOMSerializer.cpp b/XML/src/DOMSerializer.cpp
index 236bee09a..70621936f 100644
--- a/XML/src/DOMSerializer.cpp
+++ b/XML/src/DOMSerializer.cpp
@@ -1,7 +1,7 @@
 //
 // DOMSerializer.cpp
 //
-// $Id: //poco/1.3/XML/src/DOMSerializer.cpp#1 $
+// $Id: //poco/Main/XML/src/DOMSerializer.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/DOMWriter.cpp b/XML/src/DOMWriter.cpp
index e789514f5..5eb5a4615 100644
--- a/XML/src/DOMWriter.cpp
+++ b/XML/src/DOMWriter.cpp
@@ -1,7 +1,7 @@
 //
 // DOMWriter.cpp
 //
-// $Id: //poco/1.3/XML/src/DOMWriter.cpp#1 $
+// $Id: //poco/Main/XML/src/DOMWriter.cpp#13 $
 //
 // Library: XML
 // Package: DOM
@@ -44,6 +44,7 @@
 #include "Poco/DOM/DOMSerializer.h"
 #include "Poco/SAX/LexicalHandler.h"
 #include "Poco/XML/XMLException.h"
+#include "Poco/Path.h"
 #include <fstream>
 
 
@@ -103,7 +104,7 @@ void DOMWriter::writeNode(XMLByteOutputStream& ostr, const Node* pNode)
 
 void DOMWriter::writeNode(const std::string& systemId, const Node* pNode)
 {
-	std::ofstream ostr(systemId.c_str());
+	std::ofstream ostr(Poco::Path::transcode(systemId).c_str());
 	if (ostr.good())
 		writeNode(ostr, pNode);
 	else 
diff --git a/XML/src/DTDHandler.cpp b/XML/src/DTDHandler.cpp
index 9bcb73621..cff63407f 100644
--- a/XML/src/DTDHandler.cpp
+++ b/XML/src/DTDHandler.cpp
@@ -1,7 +1,7 @@
 //
 // DTDHandler.cpp
 //
-// $Id: //poco/1.3/XML/src/DTDHandler.cpp#1 $
+// $Id: //poco/Main/XML/src/DTDHandler.cpp#10 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/src/DTDMap.cpp b/XML/src/DTDMap.cpp
index 70d9d208d..5b536aa10 100644
--- a/XML/src/DTDMap.cpp
+++ b/XML/src/DTDMap.cpp
@@ -1,7 +1,7 @@
 //
 // DTDMap.cpp
 //
-// $Id: //poco/1.3/XML/src/DTDMap.cpp#1 $
+// $Id: //poco/Main/XML/src/DTDMap.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/DeclHandler.cpp b/XML/src/DeclHandler.cpp
index 7fa42d926..639d29539 100644
--- a/XML/src/DeclHandler.cpp
+++ b/XML/src/DeclHandler.cpp
@@ -1,7 +1,7 @@
 //
 // DeclHandler.cpp
 //
-// $Id: //poco/1.3/XML/src/DeclHandler.cpp#1 $
+// $Id: //poco/Main/XML/src/DeclHandler.cpp#10 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/src/DefaultHandler.cpp b/XML/src/DefaultHandler.cpp
index c66eb3f37..fd5feed1a 100644
--- a/XML/src/DefaultHandler.cpp
+++ b/XML/src/DefaultHandler.cpp
@@ -1,7 +1,7 @@
 //
 // DefaultHandler.cpp
 //
-// $Id: //poco/1.3/XML/src/DefaultHandler.cpp#1 $
+// $Id: //poco/Main/XML/src/DefaultHandler.cpp#10 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/src/Document.cpp b/XML/src/Document.cpp
index c32764521..007ff8996 100644
--- a/XML/src/Document.cpp
+++ b/XML/src/Document.cpp
@@ -1,7 +1,7 @@
 //
 // Document.cpp
 //
-// $Id: //poco/1.3/XML/src/Document.cpp#1 $
+// $Id: //poco/Main/XML/src/Document.cpp#11 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/DocumentEvent.cpp b/XML/src/DocumentEvent.cpp
index 1d159c49c..3c3da9a53 100644
--- a/XML/src/DocumentEvent.cpp
+++ b/XML/src/DocumentEvent.cpp
@@ -1,7 +1,7 @@
 //
 // DocumentEvent.cpp
 //
-// $Id: //poco/1.3/XML/src/DocumentEvent.cpp#1 $
+// $Id: //poco/Main/XML/src/DocumentEvent.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/DocumentFragment.cpp b/XML/src/DocumentFragment.cpp
index d969e21ad..dbda1408f 100644
--- a/XML/src/DocumentFragment.cpp
+++ b/XML/src/DocumentFragment.cpp
@@ -1,7 +1,7 @@
 //
 // DocumentFragment.cpp
 //
-// $Id: //poco/1.3/XML/src/DocumentFragment.cpp#1 $
+// $Id: //poco/Main/XML/src/DocumentFragment.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/DocumentType.cpp b/XML/src/DocumentType.cpp
index 7424b46a7..9e4cca0ab 100644
--- a/XML/src/DocumentType.cpp
+++ b/XML/src/DocumentType.cpp
@@ -1,7 +1,7 @@
 //
 // DocumentType.cpp
 //
-// $Id: //poco/1.3/XML/src/DocumentType.cpp#1 $
+// $Id: //poco/Main/XML/src/DocumentType.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/Element.cpp b/XML/src/Element.cpp
index f4d91c38b..c460aabc1 100644
--- a/XML/src/Element.cpp
+++ b/XML/src/Element.cpp
@@ -1,7 +1,7 @@
 //
 // Element.cpp
 //
-// $Id: //poco/1.3/XML/src/Element.cpp#1 $
+// $Id: //poco/Main/XML/src/Element.cpp#11 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/ElementsByTagNameList.cpp b/XML/src/ElementsByTagNameList.cpp
index 715034093..bfc6b41e5 100644
--- a/XML/src/ElementsByTagNameList.cpp
+++ b/XML/src/ElementsByTagNameList.cpp
@@ -1,7 +1,7 @@
 //
 // ElementsByTagNameList.cpp
 //
-// $Id: //poco/1.3/XML/src/ElementsByTagNameList.cpp#1 $
+// $Id: //poco/Main/XML/src/ElementsByTagNameList.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/Entity.cpp b/XML/src/Entity.cpp
index fcac858ff..686df4ac5 100644
--- a/XML/src/Entity.cpp
+++ b/XML/src/Entity.cpp
@@ -1,7 +1,7 @@
 //
 // Entity.cpp
 //
-// $Id: //poco/1.3/XML/src/Entity.cpp#1 $
+// $Id: //poco/Main/XML/src/Entity.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/EntityReference.cpp b/XML/src/EntityReference.cpp
index 8917dc27b..864742088 100644
--- a/XML/src/EntityReference.cpp
+++ b/XML/src/EntityReference.cpp
@@ -1,7 +1,7 @@
 //
 // EntityReference.cpp
 //
-// $Id: //poco/1.3/XML/src/EntityReference.cpp#1 $
+// $Id: //poco/Main/XML/src/EntityReference.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/EntityResolver.cpp b/XML/src/EntityResolver.cpp
index a630994f4..94f2182d7 100644
--- a/XML/src/EntityResolver.cpp
+++ b/XML/src/EntityResolver.cpp
@@ -1,7 +1,7 @@
 //
 // EntityResolver.cpp
 //
-// $Id: //poco/1.3/XML/src/EntityResolver.cpp#1 $
+// $Id: //poco/Main/XML/src/EntityResolver.cpp#10 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/src/EntityResolverImpl.cpp b/XML/src/EntityResolverImpl.cpp
index 8abe34bb7..76c402138 100644
--- a/XML/src/EntityResolverImpl.cpp
+++ b/XML/src/EntityResolverImpl.cpp
@@ -1,7 +1,7 @@
 //
 // EntityResolverImpl.cpp
 //
-// $Id: //poco/1.3/XML/src/EntityResolverImpl.cpp#1 $
+// $Id: //poco/Main/XML/src/EntityResolverImpl.cpp#13 $
 //
 // Library: XML
 // Package: SAX
@@ -40,7 +40,6 @@
 #include "Poco/URI.h"
 #include "Poco/Path.h"
 #include "Poco/Exception.h"
-#include <fstream>
 
 
 using Poco::URIStreamOpener;
diff --git a/XML/src/ErrorHandler.cpp b/XML/src/ErrorHandler.cpp
index 8b5d96641..d8861e9f6 100644
--- a/XML/src/ErrorHandler.cpp
+++ b/XML/src/ErrorHandler.cpp
@@ -1,7 +1,7 @@
 //
 // ErrorHandler.cpp
 //
-// $Id: //poco/1.3/XML/src/ErrorHandler.cpp#1 $
+// $Id: //poco/Main/XML/src/ErrorHandler.cpp#10 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/src/Event.cpp b/XML/src/Event.cpp
index a36b8c5b0..a32976575 100644
--- a/XML/src/Event.cpp
+++ b/XML/src/Event.cpp
@@ -1,7 +1,7 @@
 //
 // Event.cpp
 //
-// $Id: //poco/1.3/XML/src/Event.cpp#1 $
+// $Id: //poco/Main/XML/src/Event.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/EventDispatcher.cpp b/XML/src/EventDispatcher.cpp
index 7cdf116e3..2e7cb6ac9 100644
--- a/XML/src/EventDispatcher.cpp
+++ b/XML/src/EventDispatcher.cpp
@@ -1,7 +1,7 @@
 //
 // EventDispatcher.cpp
 //
-// $Id: //poco/1.3/XML/src/EventDispatcher.cpp#1 $
+// $Id: //poco/Main/XML/src/EventDispatcher.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/EventException.cpp b/XML/src/EventException.cpp
index 1e02fe88b..638bc56c2 100644
--- a/XML/src/EventException.cpp
+++ b/XML/src/EventException.cpp
@@ -1,7 +1,7 @@
 //
 // EventException.cpp
 //
-// $Id: //poco/1.3/XML/src/EventException.cpp#1 $
+// $Id: //poco/Main/XML/src/EventException.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/EventListener.cpp b/XML/src/EventListener.cpp
index 13e7deb5e..391f4bc1a 100644
--- a/XML/src/EventListener.cpp
+++ b/XML/src/EventListener.cpp
@@ -1,7 +1,7 @@
 //
 // EventListener.cpp
 //
-// $Id: //poco/1.3/XML/src/EventListener.cpp#1 $
+// $Id: //poco/Main/XML/src/EventListener.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/EventTarget.cpp b/XML/src/EventTarget.cpp
index 7011f87fe..4b3d6b688 100644
--- a/XML/src/EventTarget.cpp
+++ b/XML/src/EventTarget.cpp
@@ -1,7 +1,7 @@
 //
 // EventTarget.cpp
 //
-// $Id: //poco/1.3/XML/src/EventTarget.cpp#1 $
+// $Id: //poco/Main/XML/src/EventTarget.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/InputSource.cpp b/XML/src/InputSource.cpp
index 351187a17..a87ddb645 100644
--- a/XML/src/InputSource.cpp
+++ b/XML/src/InputSource.cpp
@@ -1,7 +1,7 @@
 //
 // InputSource.cpp
 //
-// $Id: //poco/1.3/XML/src/InputSource.cpp#1 $
+// $Id: //poco/Main/XML/src/InputSource.cpp#10 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/src/LexicalHandler.cpp b/XML/src/LexicalHandler.cpp
index 7b9f63b4c..08935a64c 100644
--- a/XML/src/LexicalHandler.cpp
+++ b/XML/src/LexicalHandler.cpp
@@ -1,7 +1,7 @@
 //
 // LexicalHandler.cpp
 //
-// $Id: //poco/1.3/XML/src/LexicalHandler.cpp#1 $
+// $Id: //poco/Main/XML/src/LexicalHandler.cpp#10 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/src/Locator.cpp b/XML/src/Locator.cpp
index 28a5af3be..246eaad29 100644
--- a/XML/src/Locator.cpp
+++ b/XML/src/Locator.cpp
@@ -1,7 +1,7 @@
 //
 // Locator.cpp
 //
-// $Id: //poco/1.3/XML/src/Locator.cpp#1 $
+// $Id: //poco/Main/XML/src/Locator.cpp#10 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/src/LocatorImpl.cpp b/XML/src/LocatorImpl.cpp
index 431dec18f..be78d841a 100644
--- a/XML/src/LocatorImpl.cpp
+++ b/XML/src/LocatorImpl.cpp
@@ -1,7 +1,7 @@
 //
 // LocatorImpl.cpp
 //
-// $Id: //poco/1.3/XML/src/LocatorImpl.cpp#1 $
+// $Id: //poco/Main/XML/src/LocatorImpl.cpp#10 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/src/MutationEvent.cpp b/XML/src/MutationEvent.cpp
index 675223b54..d9a5deb5a 100644
--- a/XML/src/MutationEvent.cpp
+++ b/XML/src/MutationEvent.cpp
@@ -1,7 +1,7 @@
 //
 // MutationEvent.cpp
 //
-// $Id: //poco/1.3/XML/src/MutationEvent.cpp#1 $
+// $Id: //poco/Main/XML/src/MutationEvent.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/Name.cpp b/XML/src/Name.cpp
index 2ec606651..948e00a75 100644
--- a/XML/src/Name.cpp
+++ b/XML/src/Name.cpp
@@ -1,7 +1,7 @@
 //
 // Name.cpp
 //
-// $Id: //poco/1.3/XML/src/Name.cpp#1 $
+// $Id: //poco/Main/XML/src/Name.cpp#11 $
 //
 // Library: XML
 // Package: XML
diff --git a/XML/src/NamePool.cpp b/XML/src/NamePool.cpp
index cb78fb593..e84481f4f 100644
--- a/XML/src/NamePool.cpp
+++ b/XML/src/NamePool.cpp
@@ -1,7 +1,7 @@
 //
 // NamePool.cpp
 //
-// $Id: //poco/1.3/XML/src/NamePool.cpp#1 $
+// $Id: //poco/Main/XML/src/NamePool.cpp#10 $
 //
 // Library: XML
 // Package: XML
diff --git a/XML/src/NamedNodeMap.cpp b/XML/src/NamedNodeMap.cpp
index a16b1700e..980c06577 100644
--- a/XML/src/NamedNodeMap.cpp
+++ b/XML/src/NamedNodeMap.cpp
@@ -1,7 +1,7 @@
 //
 // NamedNodeMap.cpp
 //
-// $Id: //poco/1.3/XML/src/NamedNodeMap.cpp#1 $
+// $Id: //poco/Main/XML/src/NamedNodeMap.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/NamespaceStrategy.cpp b/XML/src/NamespaceStrategy.cpp
index 41407095e..4e55a0f01 100644
--- a/XML/src/NamespaceStrategy.cpp
+++ b/XML/src/NamespaceStrategy.cpp
@@ -1,7 +1,7 @@
 //
 // NamespaceStrategy.cpp
 //
-// $Id: //poco/1.3/XML/src/NamespaceStrategy.cpp#1 $
+// $Id: //poco/Main/XML/src/NamespaceStrategy.cpp#14 $
 //
 // Library: XML
 // Package: XML
diff --git a/XML/src/NamespaceSupport.cpp b/XML/src/NamespaceSupport.cpp
index b62a64d2f..e392f5216 100644
--- a/XML/src/NamespaceSupport.cpp
+++ b/XML/src/NamespaceSupport.cpp
@@ -1,7 +1,7 @@
 //
 // NamespaceSupport.cpp
 //
-// $Id: //poco/1.3/XML/src/NamespaceSupport.cpp#1 $
+// $Id: //poco/Main/XML/src/NamespaceSupport.cpp#10 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/src/Node.cpp b/XML/src/Node.cpp
index d1f134551..c1beddfa2 100644
--- a/XML/src/Node.cpp
+++ b/XML/src/Node.cpp
@@ -1,7 +1,7 @@
 //
 // Node.cpp
 //
-// $Id: //poco/1.3/XML/src/Node.cpp#1 $
+// $Id: //poco/Main/XML/src/Node.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/NodeFilter.cpp b/XML/src/NodeFilter.cpp
index 0ea210849..2d985aa66 100644
--- a/XML/src/NodeFilter.cpp
+++ b/XML/src/NodeFilter.cpp
@@ -1,7 +1,7 @@
 //
 // NodeFilter.cpp
 //
-// $Id: //poco/1.3/XML/src/NodeFilter.cpp#1 $
+// $Id: //poco/Main/XML/src/NodeFilter.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/NodeIterator.cpp b/XML/src/NodeIterator.cpp
index 0e1ae0751..d2aedebba 100644
--- a/XML/src/NodeIterator.cpp
+++ b/XML/src/NodeIterator.cpp
@@ -1,7 +1,7 @@
 //
 // NodeIterator.cpp
 //
-// $Id: //poco/1.3/XML/src/NodeIterator.cpp#1 $
+// $Id: //poco/Main/XML/src/NodeIterator.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/NodeList.cpp b/XML/src/NodeList.cpp
index d4ef071fb..7941352a7 100644
--- a/XML/src/NodeList.cpp
+++ b/XML/src/NodeList.cpp
@@ -1,7 +1,7 @@
 //
 // NodeList.cpp
 //
-// $Id: //poco/1.3/XML/src/NodeList.cpp#1 $
+// $Id: //poco/Main/XML/src/NodeList.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/Notation.cpp b/XML/src/Notation.cpp
index 4b08a0558..ff6021566 100644
--- a/XML/src/Notation.cpp
+++ b/XML/src/Notation.cpp
@@ -1,7 +1,7 @@
 //
 // Notation.cpp
 //
-// $Id: //poco/1.3/XML/src/Notation.cpp#1 $
+// $Id: //poco/Main/XML/src/Notation.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/ParserEngine.cpp b/XML/src/ParserEngine.cpp
index 5faaccceb..59625025d 100644
--- a/XML/src/ParserEngine.cpp
+++ b/XML/src/ParserEngine.cpp
@@ -1,7 +1,7 @@
 //
 // ParserEngine.cpp
 //
-// $Id: //poco/1.3/XML/src/ParserEngine.cpp#1 $
+// $Id: //poco/Main/XML/src/ParserEngine.cpp#12 $
 //
 // Library: XML
 // Package: XML
diff --git a/XML/src/ProcessingInstruction.cpp b/XML/src/ProcessingInstruction.cpp
index 0c45e43fb..934ae60af 100644
--- a/XML/src/ProcessingInstruction.cpp
+++ b/XML/src/ProcessingInstruction.cpp
@@ -1,7 +1,7 @@
 //
 // ProcessingInstruction.cpp
 //
-// $Id: //poco/1.3/XML/src/ProcessingInstruction.cpp#1 $
+// $Id: //poco/Main/XML/src/ProcessingInstruction.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/SAXException.cpp b/XML/src/SAXException.cpp
index 9a9821c9c..f859fa3b4 100644
--- a/XML/src/SAXException.cpp
+++ b/XML/src/SAXException.cpp
@@ -1,7 +1,7 @@
 //
 // SAXException.cpp
 //
-// $Id: //poco/1.3/XML/src/SAXException.cpp#1 $
+// $Id: //poco/Main/XML/src/SAXException.cpp#11 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/src/SAXParser.cpp b/XML/src/SAXParser.cpp
index 5ea5d41a0..e5c36976b 100644
--- a/XML/src/SAXParser.cpp
+++ b/XML/src/SAXParser.cpp
@@ -1,7 +1,7 @@
 //
 // SAXParser.cpp
 //
-// $Id: //poco/1.3/XML/src/SAXParser.cpp#1 $
+// $Id: //poco/Main/XML/src/SAXParser.cpp#11 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/src/Text.cpp b/XML/src/Text.cpp
index 615cac221..d44b768be 100644
--- a/XML/src/Text.cpp
+++ b/XML/src/Text.cpp
@@ -1,7 +1,7 @@
 //
 // Text.cpp
 //
-// $Id: //poco/1.3/XML/src/Text.cpp#1 $
+// $Id: //poco/Main/XML/src/Text.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/TreeWalker.cpp b/XML/src/TreeWalker.cpp
index a6f432cfc..64643401e 100644
--- a/XML/src/TreeWalker.cpp
+++ b/XML/src/TreeWalker.cpp
@@ -1,7 +1,7 @@
 //
 // TreeWalker.cpp
 //
-// $Id: //poco/1.3/XML/src/TreeWalker.cpp#1 $
+// $Id: //poco/Main/XML/src/TreeWalker.cpp#10 $
 //
 // Library: XML
 // Package: DOM
diff --git a/XML/src/WhitespaceFilter.cpp b/XML/src/WhitespaceFilter.cpp
index 77c4595a6..54f1afbb0 100644
--- a/XML/src/WhitespaceFilter.cpp
+++ b/XML/src/WhitespaceFilter.cpp
@@ -1,7 +1,7 @@
 //
 // WhitespaceFilter.cpp
 //
-// $Id: //poco/1.3/XML/src/WhitespaceFilter.cpp#1 $
+// $Id: //poco/Main/XML/src/WhitespaceFilter.cpp#10 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/src/XMLException.cpp b/XML/src/XMLException.cpp
index 7629fc340..f320345f7 100644
--- a/XML/src/XMLException.cpp
+++ b/XML/src/XMLException.cpp
@@ -1,7 +1,7 @@
 //
 // XMLException.cpp
 //
-// $Id: //poco/1.3/XML/src/XMLException.cpp#1 $
+// $Id: //poco/Main/XML/src/XMLException.cpp#10 $
 //
 // Library: XML
 // Package: XML
diff --git a/XML/src/XMLFilter.cpp b/XML/src/XMLFilter.cpp
index 762ea4f28..21f7e8083 100644
--- a/XML/src/XMLFilter.cpp
+++ b/XML/src/XMLFilter.cpp
@@ -1,7 +1,7 @@
 //
 // XMLFilter.cpp
 //
-// $Id: //poco/1.3/XML/src/XMLFilter.cpp#1 $
+// $Id: //poco/Main/XML/src/XMLFilter.cpp#10 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/src/XMLFilterImpl.cpp b/XML/src/XMLFilterImpl.cpp
index bf65b24a4..4376be279 100644
--- a/XML/src/XMLFilterImpl.cpp
+++ b/XML/src/XMLFilterImpl.cpp
@@ -1,7 +1,7 @@
 //
 // XMLFilterImpl.cpp
 //
-// $Id: //poco/1.3/XML/src/XMLFilterImpl.cpp#1 $
+// $Id: //poco/Main/XML/src/XMLFilterImpl.cpp#11 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/src/XMLReader.cpp b/XML/src/XMLReader.cpp
index c70a72ef5..eef078bb9 100644
--- a/XML/src/XMLReader.cpp
+++ b/XML/src/XMLReader.cpp
@@ -1,7 +1,7 @@
 //
 // XMLReader.cpp
 //
-// $Id: //poco/1.3/XML/src/XMLReader.cpp#1 $
+// $Id: //poco/Main/XML/src/XMLReader.cpp#10 $
 //
 // Library: XML
 // Package: SAX
diff --git a/XML/src/XMLString.cpp b/XML/src/XMLString.cpp
index 1ede83fe8..03ac50103 100644
--- a/XML/src/XMLString.cpp
+++ b/XML/src/XMLString.cpp
@@ -1,7 +1,7 @@
 //
 // XMLString.cpp
 //
-// $Id: //poco/1.3/XML/src/XMLString.cpp#1 $
+// $Id: //poco/Main/XML/src/XMLString.cpp#10 $
 //
 // Library: XML
 // Package: XML
diff --git a/XML/src/XMLWriter.cpp b/XML/src/XMLWriter.cpp
index 5afacf78e..d0cedb3a5 100644
--- a/XML/src/XMLWriter.cpp
+++ b/XML/src/XMLWriter.cpp
@@ -1,7 +1,7 @@
 //
 // XMLWriter.cpp
 //
-// $Id: //poco/1.3/XML/src/XMLWriter.cpp#1 $
+// $Id: //poco/Main/XML/src/XMLWriter.cpp#14 $
 //
 // Library: XML
 // Package: XML
diff --git a/XML/src/expat_config.h b/XML/src/expat_config.h
index c649e91fb..3ca4b31f6 100644
--- a/XML/src/expat_config.h
+++ b/XML/src/expat_config.h
@@ -1,7 +1,7 @@
 //
 // expat_config.h
 //
-// $Id: //poco/1.3/XML/src/expat_config.h#1 $
+// $Id: //poco/Main/XML/src/expat_config.h#8 $
 //
 // Poco XML specific configuration for expat.
 //
diff --git a/XML/testsuite/Makefile b/XML/testsuite/Makefile
index ac99f4f52..093460cd0 100644
--- a/XML/testsuite/Makefile
+++ b/XML/testsuite/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/1.3/XML/testsuite/Makefile#1 $
+# $Id: //poco/Main/XML/testsuite/Makefile#5 $
 #
 # Makefile for Poco XML testsuite
 #
diff --git a/XML/testsuite/TestSuite.vmsbuild b/XML/testsuite/TestSuite.vmsbuild
index cceda5068..9e1d3e196 100644
--- a/XML/testsuite/TestSuite.vmsbuild
+++ b/XML/testsuite/TestSuite.vmsbuild
@@ -1,7 +1,7 @@
 #
 # TestSuite.vmsbuild
 #
-# $Id: //poco/1.3/XML/testsuite/TestSuite.vmsbuild#1 $
+# $Id: //poco/Main/XML/testsuite/TestSuite.vmsbuild#5 $
 #
 EXE=TestRunner
 AttributesImplTest
diff --git a/XML/testsuite/src/AttributesImplTest.cpp b/XML/testsuite/src/AttributesImplTest.cpp
index 44636d777..c1d364511 100644
--- a/XML/testsuite/src/AttributesImplTest.cpp
+++ b/XML/testsuite/src/AttributesImplTest.cpp
@@ -1,7 +1,7 @@
 //
 // AttributesImplTest.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/AttributesImplTest.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/AttributesImplTest.cpp#9 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/XML/testsuite/src/AttributesImplTest.h b/XML/testsuite/src/AttributesImplTest.h
index 056b2e115..01721f401 100644
--- a/XML/testsuite/src/AttributesImplTest.h
+++ b/XML/testsuite/src/AttributesImplTest.h
@@ -1,7 +1,7 @@
 //
 // AttributesImplTest.h
 //
-// $Id: //poco/1.3/XML/testsuite/src/AttributesImplTest.h#1 $
+// $Id: //poco/Main/XML/testsuite/src/AttributesImplTest.h#8 $
 //
 // Definition of the AttributesImplTest class.
 //
diff --git a/XML/testsuite/src/ChildNodesTest.cpp b/XML/testsuite/src/ChildNodesTest.cpp
index 0fcb8ec16..f1a050fc1 100644
--- a/XML/testsuite/src/ChildNodesTest.cpp
+++ b/XML/testsuite/src/ChildNodesTest.cpp
@@ -1,7 +1,7 @@
 //
 // ChildNodesTest.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/ChildNodesTest.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/ChildNodesTest.cpp#9 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/XML/testsuite/src/ChildNodesTest.h b/XML/testsuite/src/ChildNodesTest.h
index b183f2839..157d038d6 100644
--- a/XML/testsuite/src/ChildNodesTest.h
+++ b/XML/testsuite/src/ChildNodesTest.h
@@ -1,7 +1,7 @@
 //
 // ChildNodesTest.h
 //
-// $Id: //poco/1.3/XML/testsuite/src/ChildNodesTest.h#1 $
+// $Id: //poco/Main/XML/testsuite/src/ChildNodesTest.h#8 $
 //
 // Definition of the ChildNodesTest class.
 //
diff --git a/XML/testsuite/src/DOMTestSuite.cpp b/XML/testsuite/src/DOMTestSuite.cpp
index 60e2dfb32..048d79b0b 100644
--- a/XML/testsuite/src/DOMTestSuite.cpp
+++ b/XML/testsuite/src/DOMTestSuite.cpp
@@ -1,7 +1,7 @@
 //
 // DOMTestSuite.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/DOMTestSuite.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/DOMTestSuite.cpp#8 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/XML/testsuite/src/DOMTestSuite.h b/XML/testsuite/src/DOMTestSuite.h
index c87bd26fc..c3524947b 100644
--- a/XML/testsuite/src/DOMTestSuite.h
+++ b/XML/testsuite/src/DOMTestSuite.h
@@ -1,7 +1,7 @@
 //
 // DOMTestSuite.h
 //
-// $Id: //poco/1.3/XML/testsuite/src/DOMTestSuite.h#1 $
+// $Id: //poco/Main/XML/testsuite/src/DOMTestSuite.h#8 $
 //
 // Definition of the DOMTestSuite class.
 //
diff --git a/XML/testsuite/src/DocumentTest.cpp b/XML/testsuite/src/DocumentTest.cpp
index 7e026e34c..8de523878 100644
--- a/XML/testsuite/src/DocumentTest.cpp
+++ b/XML/testsuite/src/DocumentTest.cpp
@@ -1,7 +1,7 @@
 //
 // DocumentTest.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/DocumentTest.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/DocumentTest.cpp#10 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/XML/testsuite/src/DocumentTest.h b/XML/testsuite/src/DocumentTest.h
index 9a3d35fe4..ee6ff70ab 100644
--- a/XML/testsuite/src/DocumentTest.h
+++ b/XML/testsuite/src/DocumentTest.h
@@ -1,7 +1,7 @@
 //
 // DocumentTest.h
 //
-// $Id: //poco/1.3/XML/testsuite/src/DocumentTest.h#1 $
+// $Id: //poco/Main/XML/testsuite/src/DocumentTest.h#9 $
 //
 // Definition of the DocumentTest class.
 //
diff --git a/XML/testsuite/src/DocumentTypeTest.cpp b/XML/testsuite/src/DocumentTypeTest.cpp
index 473afb817..7d2e1f58d 100644
--- a/XML/testsuite/src/DocumentTypeTest.cpp
+++ b/XML/testsuite/src/DocumentTypeTest.cpp
@@ -1,7 +1,7 @@
 //
 // DocumentTypeTest.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/DocumentTypeTest.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/DocumentTypeTest.cpp#9 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/XML/testsuite/src/DocumentTypeTest.h b/XML/testsuite/src/DocumentTypeTest.h
index 198846d28..26bfb3a47 100644
--- a/XML/testsuite/src/DocumentTypeTest.h
+++ b/XML/testsuite/src/DocumentTypeTest.h
@@ -1,7 +1,7 @@
 //
 // DocumentTypeTest.h
 //
-// $Id: //poco/1.3/XML/testsuite/src/DocumentTypeTest.h#1 $
+// $Id: //poco/Main/XML/testsuite/src/DocumentTypeTest.h#8 $
 //
 // Definition of the DocumentTypeTest class.
 //
diff --git a/XML/testsuite/src/Driver.cpp b/XML/testsuite/src/Driver.cpp
index a59dbda5a..ec17a9a9a 100644
--- a/XML/testsuite/src/Driver.cpp
+++ b/XML/testsuite/src/Driver.cpp
@@ -1,7 +1,7 @@
 //
 // Driver.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/Driver.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/Driver.cpp#9 $
 //
 // Console-based test driver for Poco XML.
 //
diff --git a/XML/testsuite/src/ElementTest.cpp b/XML/testsuite/src/ElementTest.cpp
index cd030c5cd..e1fe4b755 100644
--- a/XML/testsuite/src/ElementTest.cpp
+++ b/XML/testsuite/src/ElementTest.cpp
@@ -1,7 +1,7 @@
 //
 // ElementTest.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/ElementTest.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/ElementTest.cpp#9 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/XML/testsuite/src/ElementTest.h b/XML/testsuite/src/ElementTest.h
index bcb1f6b60..1bf768d24 100644
--- a/XML/testsuite/src/ElementTest.h
+++ b/XML/testsuite/src/ElementTest.h
@@ -1,7 +1,7 @@
 //
 // ElementTest.h
 //
-// $Id: //poco/1.3/XML/testsuite/src/ElementTest.h#1 $
+// $Id: //poco/Main/XML/testsuite/src/ElementTest.h#8 $
 //
 // Definition of the ElementTest class.
 //
diff --git a/XML/testsuite/src/EventTest.cpp b/XML/testsuite/src/EventTest.cpp
index d54e8e19d..f92d6121e 100644
--- a/XML/testsuite/src/EventTest.cpp
+++ b/XML/testsuite/src/EventTest.cpp
@@ -1,7 +1,7 @@
 //
 // EventTest.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/EventTest.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/EventTest.cpp#9 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/XML/testsuite/src/EventTest.h b/XML/testsuite/src/EventTest.h
index cf751990d..bd07e3071 100644
--- a/XML/testsuite/src/EventTest.h
+++ b/XML/testsuite/src/EventTest.h
@@ -1,7 +1,7 @@
 //
 // EventTest.h
 //
-// $Id: //poco/1.3/XML/testsuite/src/EventTest.h#1 $
+// $Id: //poco/Main/XML/testsuite/src/EventTest.h#8 $
 //
 // Definition of the EventTest class.
 //
diff --git a/XML/testsuite/src/NamePoolTest.cpp b/XML/testsuite/src/NamePoolTest.cpp
index 032dafab2..c878f948a 100644
--- a/XML/testsuite/src/NamePoolTest.cpp
+++ b/XML/testsuite/src/NamePoolTest.cpp
@@ -1,7 +1,7 @@
 //
 // NamePoolTest.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/NamePoolTest.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/NamePoolTest.cpp#9 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/XML/testsuite/src/NamePoolTest.h b/XML/testsuite/src/NamePoolTest.h
index 7b342dcf0..851e9a314 100644
--- a/XML/testsuite/src/NamePoolTest.h
+++ b/XML/testsuite/src/NamePoolTest.h
@@ -1,7 +1,7 @@
 //
 // NamePoolTest.h
 //
-// $Id: //poco/1.3/XML/testsuite/src/NamePoolTest.h#1 $
+// $Id: //poco/Main/XML/testsuite/src/NamePoolTest.h#8 $
 //
 // Definition of the NamePoolTest class.
 //
diff --git a/XML/testsuite/src/NameTest.cpp b/XML/testsuite/src/NameTest.cpp
index 60ef072ad..9914b6f23 100644
--- a/XML/testsuite/src/NameTest.cpp
+++ b/XML/testsuite/src/NameTest.cpp
@@ -1,7 +1,7 @@
 //
 // NameTest.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/NameTest.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/NameTest.cpp#10 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/XML/testsuite/src/NameTest.h b/XML/testsuite/src/NameTest.h
index 81a0b3829..cde9061ff 100644
--- a/XML/testsuite/src/NameTest.h
+++ b/XML/testsuite/src/NameTest.h
@@ -1,7 +1,7 @@
 //
 // NameTest.h
 //
-// $Id: //poco/1.3/XML/testsuite/src/NameTest.h#1 $
+// $Id: //poco/Main/XML/testsuite/src/NameTest.h#9 $
 //
 // Definition of the NameTest class.
 //
diff --git a/XML/testsuite/src/NamespaceSupportTest.cpp b/XML/testsuite/src/NamespaceSupportTest.cpp
index 8d4531bde..72b731cbc 100644
--- a/XML/testsuite/src/NamespaceSupportTest.cpp
+++ b/XML/testsuite/src/NamespaceSupportTest.cpp
@@ -1,7 +1,7 @@
 //
 // NamespaceSupportTest.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/NamespaceSupportTest.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/NamespaceSupportTest.cpp#9 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/XML/testsuite/src/NamespaceSupportTest.h b/XML/testsuite/src/NamespaceSupportTest.h
index 12038761b..fbf74dfe8 100644
--- a/XML/testsuite/src/NamespaceSupportTest.h
+++ b/XML/testsuite/src/NamespaceSupportTest.h
@@ -1,7 +1,7 @@
 //
 // NamespaceSupportTest.h
 //
-// $Id: //poco/1.3/XML/testsuite/src/NamespaceSupportTest.h#1 $
+// $Id: //poco/Main/XML/testsuite/src/NamespaceSupportTest.h#8 $
 //
 // Definition of the NamespaceSupportTest class.
 //
diff --git a/XML/testsuite/src/NodeIteratorTest.cpp b/XML/testsuite/src/NodeIteratorTest.cpp
index 7ff80154b..67fe2c10a 100644
--- a/XML/testsuite/src/NodeIteratorTest.cpp
+++ b/XML/testsuite/src/NodeIteratorTest.cpp
@@ -1,7 +1,7 @@
 //
 // NodeIteratorTest.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/NodeIteratorTest.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/NodeIteratorTest.cpp#9 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/XML/testsuite/src/NodeIteratorTest.h b/XML/testsuite/src/NodeIteratorTest.h
index 056bb4dd8..e16879c5c 100644
--- a/XML/testsuite/src/NodeIteratorTest.h
+++ b/XML/testsuite/src/NodeIteratorTest.h
@@ -1,7 +1,7 @@
 //
 // NodeIteratorTest.h
 //
-// $Id: //poco/1.3/XML/testsuite/src/NodeIteratorTest.h#1 $
+// $Id: //poco/Main/XML/testsuite/src/NodeIteratorTest.h#8 $
 //
 // Definition of the NodeIteratorTest class.
 //
diff --git a/XML/testsuite/src/NodeTest.cpp b/XML/testsuite/src/NodeTest.cpp
index 29bef4454..cee6440bb 100644
--- a/XML/testsuite/src/NodeTest.cpp
+++ b/XML/testsuite/src/NodeTest.cpp
@@ -1,7 +1,7 @@
 //
 // NodeTest.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/NodeTest.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/NodeTest.cpp#9 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/XML/testsuite/src/NodeTest.h b/XML/testsuite/src/NodeTest.h
index f0d6f8bf9..407c74a27 100644
--- a/XML/testsuite/src/NodeTest.h
+++ b/XML/testsuite/src/NodeTest.h
@@ -1,7 +1,7 @@
 //
 // NodeTest.h
 //
-// $Id: //poco/1.3/XML/testsuite/src/NodeTest.h#1 $
+// $Id: //poco/Main/XML/testsuite/src/NodeTest.h#8 $
 //
 // Definition of the NodeTest class.
 //
diff --git a/XML/testsuite/src/ParserWriterTest.cpp b/XML/testsuite/src/ParserWriterTest.cpp
index a461fc974..649cdf711 100644
--- a/XML/testsuite/src/ParserWriterTest.cpp
+++ b/XML/testsuite/src/ParserWriterTest.cpp
@@ -1,7 +1,7 @@
 //
 // ParserWriterTest.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/ParserWriterTest.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/ParserWriterTest.cpp#11 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/XML/testsuite/src/ParserWriterTest.h b/XML/testsuite/src/ParserWriterTest.h
index 036bced96..95217feaa 100644
--- a/XML/testsuite/src/ParserWriterTest.h
+++ b/XML/testsuite/src/ParserWriterTest.h
@@ -1,7 +1,7 @@
 //
 // ParserWriterTest.h
 //
-// $Id: //poco/1.3/XML/testsuite/src/ParserWriterTest.h#1 $
+// $Id: //poco/Main/XML/testsuite/src/ParserWriterTest.h#9 $
 //
 // Definition of the ParserWriterTest class.
 //
diff --git a/XML/testsuite/src/SAXParserTest.cpp b/XML/testsuite/src/SAXParserTest.cpp
index 51f5b7e8a..e87b1b4b8 100644
--- a/XML/testsuite/src/SAXParserTest.cpp
+++ b/XML/testsuite/src/SAXParserTest.cpp
@@ -1,7 +1,7 @@
 //
 // SAXParserTest.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/SAXParserTest.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/SAXParserTest.cpp#9 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/XML/testsuite/src/SAXParserTest.h b/XML/testsuite/src/SAXParserTest.h
index 574f99248..1efdcb80b 100644
--- a/XML/testsuite/src/SAXParserTest.h
+++ b/XML/testsuite/src/SAXParserTest.h
@@ -1,7 +1,7 @@
 //
 // SAXParserTest.h
 //
-// $Id: //poco/1.3/XML/testsuite/src/SAXParserTest.h#1 $
+// $Id: //poco/Main/XML/testsuite/src/SAXParserTest.h#9 $
 //
 // Definition of the SAXParserTest class.
 //
diff --git a/XML/testsuite/src/SAXTestSuite.cpp b/XML/testsuite/src/SAXTestSuite.cpp
index 76edc5526..4d4b3bdcb 100644
--- a/XML/testsuite/src/SAXTestSuite.cpp
+++ b/XML/testsuite/src/SAXTestSuite.cpp
@@ -1,7 +1,7 @@
 //
 // SAXTestSuite.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/SAXTestSuite.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/SAXTestSuite.cpp#8 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/XML/testsuite/src/SAXTestSuite.h b/XML/testsuite/src/SAXTestSuite.h
index d228a37a6..bfe3c1bd4 100644
--- a/XML/testsuite/src/SAXTestSuite.h
+++ b/XML/testsuite/src/SAXTestSuite.h
@@ -1,7 +1,7 @@
 //
 // SAXTestSuite.h
 //
-// $Id: //poco/1.3/XML/testsuite/src/SAXTestSuite.h#1 $
+// $Id: //poco/Main/XML/testsuite/src/SAXTestSuite.h#8 $
 //
 // Definition of the SAXTestSuite class.
 //
diff --git a/XML/testsuite/src/TextTest.cpp b/XML/testsuite/src/TextTest.cpp
index eb950aafc..81f110b75 100644
--- a/XML/testsuite/src/TextTest.cpp
+++ b/XML/testsuite/src/TextTest.cpp
@@ -1,7 +1,7 @@
 //
 // TextTest.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/TextTest.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/TextTest.cpp#9 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/XML/testsuite/src/TextTest.h b/XML/testsuite/src/TextTest.h
index c9e20f270..84e93b483 100644
--- a/XML/testsuite/src/TextTest.h
+++ b/XML/testsuite/src/TextTest.h
@@ -1,7 +1,7 @@
 //
 // TextTest.h
 //
-// $Id: //poco/1.3/XML/testsuite/src/TextTest.h#1 $
+// $Id: //poco/Main/XML/testsuite/src/TextTest.h#8 $
 //
 // Definition of the TextTest class.
 //
diff --git a/XML/testsuite/src/TreeWalkerTest.cpp b/XML/testsuite/src/TreeWalkerTest.cpp
index 5e2053596..40317ac32 100644
--- a/XML/testsuite/src/TreeWalkerTest.cpp
+++ b/XML/testsuite/src/TreeWalkerTest.cpp
@@ -1,7 +1,7 @@
 //
 // TreeWalkerTest.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/TreeWalkerTest.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/TreeWalkerTest.cpp#9 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/XML/testsuite/src/TreeWalkerTest.h b/XML/testsuite/src/TreeWalkerTest.h
index 13b48015f..1aab1dac9 100644
--- a/XML/testsuite/src/TreeWalkerTest.h
+++ b/XML/testsuite/src/TreeWalkerTest.h
@@ -1,7 +1,7 @@
 //
 // TreeWalkerTest.h
 //
-// $Id: //poco/1.3/XML/testsuite/src/TreeWalkerTest.h#1 $
+// $Id: //poco/Main/XML/testsuite/src/TreeWalkerTest.h#8 $
 //
 // Definition of the TreeWalkerTest class.
 //
diff --git a/XML/testsuite/src/WinDriver.cpp b/XML/testsuite/src/WinDriver.cpp
index b9a9dd036..26ca756e9 100644
--- a/XML/testsuite/src/WinDriver.cpp
+++ b/XML/testsuite/src/WinDriver.cpp
@@ -1,7 +1,7 @@
 //
 // WinDriver.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/WinDriver.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/WinDriver.cpp#8 $
 //
 // Windows test driver for Poco XML.
 //
diff --git a/XML/testsuite/src/XMLTestSuite.cpp b/XML/testsuite/src/XMLTestSuite.cpp
index 859575a41..9ef00fde2 100644
--- a/XML/testsuite/src/XMLTestSuite.cpp
+++ b/XML/testsuite/src/XMLTestSuite.cpp
@@ -1,7 +1,7 @@
 //
 // XMLTestSuite.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/XMLTestSuite.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/XMLTestSuite.cpp#8 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/XML/testsuite/src/XMLTestSuite.h b/XML/testsuite/src/XMLTestSuite.h
index b22bf656d..f07ef0b8b 100644
--- a/XML/testsuite/src/XMLTestSuite.h
+++ b/XML/testsuite/src/XMLTestSuite.h
@@ -1,7 +1,7 @@
 //
 // XMLTestSuite.h
 //
-// $Id: //poco/1.3/XML/testsuite/src/XMLTestSuite.h#1 $
+// $Id: //poco/Main/XML/testsuite/src/XMLTestSuite.h#8 $
 //
 // Definition of the XMLTestSuite class.
 //
diff --git a/XML/testsuite/src/XMLWriterTest.cpp b/XML/testsuite/src/XMLWriterTest.cpp
index 3e7571385..74f49d5ed 100644
--- a/XML/testsuite/src/XMLWriterTest.cpp
+++ b/XML/testsuite/src/XMLWriterTest.cpp
@@ -1,7 +1,7 @@
 //
 // XMLWriterTest.cpp
 //
-// $Id: //poco/1.3/XML/testsuite/src/XMLWriterTest.cpp#1 $
+// $Id: //poco/Main/XML/testsuite/src/XMLWriterTest.cpp#10 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/XML/testsuite/src/XMLWriterTest.h b/XML/testsuite/src/XMLWriterTest.h
index 024e90d58..5fce50d7a 100644
--- a/XML/testsuite/src/XMLWriterTest.h
+++ b/XML/testsuite/src/XMLWriterTest.h
@@ -1,7 +1,7 @@
 //
 // XMLWriterTest.h
 //
-// $Id: //poco/1.3/XML/testsuite/src/XMLWriterTest.h#1 $
+// $Id: //poco/Main/XML/testsuite/src/XMLWriterTest.h#9 $
 //
 // Definition of the XMLWriterTest class.
 //