diff --git a/Projects/Win32/VC6/xerces-all/all/all.mak b/Projects/Win32/VC6/xerces-all/all/all.mak
index 245b0648d2ae68f37351b5b7645ebfe7b209f56f..09e93e4043fb088f0aa79404bdd98a7440375b17 100644
--- a/Projects/Win32/VC6/xerces-all/all/all.mak
+++ b/Projects/Win32/VC6/xerces-all/all/all.mak
@@ -36,12 +36,12 @@ ALL :
 
 !ELSE 
 
-ALL : "DeprecatedDOMCount - Win64 Release" "DOMTraversalTest - Win64 Release" "DOMTypeInfoTest - Win64 Release" "XercesLib - Win64 Release" "ThreadTest - Win64 Release" "MemHandlerTest - Win64 Release" "StdInParse - Win64 Release" "SEnumVal - Win64 Release" "SAXPrint - Win64 Release" "SAXCount - Win64 Release" "SAX2Print - Win64 Release" "SAX2Count - Win64 Release" "Redirect - Win64 Release" "RangeTest - Win64 Release" "PParse - Win64 Release" "MemParse - Win64 Release" "InitTermTest - Win64 Release" "EnumVal - Win64 Release" "EncodingTest - Win64 Release" "DOMTest - Win64 Release" "DOMPrint - Win64 Release" "DOMMemTest - Win64 Release" "DOMCount - Win64 Release" "CreateDOMDocument - Win64 Release" 
+ALL : "DOMNormalizerTest - Win64 Release" "DOMTypeInfoTest - Win64 Release" "DeprecatedDOMCount - Win64 Release" "DOMTraversalTest - Win64 Release" "XercesLib - Win64 Release" "MemHandlerTest - Win64 Release" "XSerializerTest - Win64 Release" "ThreadTest - Win64 Release" "StdInParse - Win64 Release" "SEnumVal - Win64 Release" "SAXPrint - Win64 Release" "SAXCount - Win64 Release" "SAX2Print - Win64 Release" "SAX2Count - Win64 Release" "Redirect - Win64 Release" "RangeTest - Win64 Release" "PParse - Win64 Release" "MemParse - Win64 Release" "InitTermTest - Win64 Release" "EnumVal - Win64 Release" "EncodingTest - Win64 Release" "DOMTest - Win64 Release" "DOMPrint - Win64 Release" "DOMMemTest - Win64 Release" "DOMCount - Win64 Release" "CreateDOMDocument - Win64 Release" 
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"CreateDOMDocument - Win32 ReleaseCLEAN" "DOMCount - Win32 ReleaseCLEAN" "DOMMemTest - Win32 ReleaseCLEAN" "DOMPrint - Win32 ReleaseCLEAN" "DOMTest - Win32 ReleaseCLEAN" "EncodingTest - Win32 ReleaseCLEAN" "EnumVal - Win32 ReleaseCLEAN" "InitTermTest - Win32 ReleaseCLEAN" "MemParse - Win32 ReleaseCLEAN" "PParse - Win32 ReleaseCLEAN" "RangeTest - Win32 ReleaseCLEAN" "Redirect - Win32 ReleaseCLEAN" "SAX2Count - Win32 ReleaseCLEAN" "SAX2Print - Win32 ReleaseCLEAN" "SAXCount - Win32 ReleaseCLEAN" "SAXPrint - Win32 ReleaseCLEAN" "SEnumVal - Win32 ReleaseCLEAN" "StdInParse - Win32 ReleaseCLEAN" "ThreadTest - Win32 ReleaseCLEAN" "MemHandlerTest - Win32 ReleaseCLEAN" "XercesLib - Win32 ReleaseCLEAN" "DOMTraversalTest - Win32 ReleaseCLEAN" "DOMTypeInfoTest - Win32 ReleaseCLEAN" "DeprecatedDOMCount - Win32 ReleaseCLEAN" 
+CLEAN :"CreateDOMDocument - Win32 ReleaseCLEAN" "DOMCount - Win32 ReleaseCLEAN" "DOMMemTest - Win32 ReleaseCLEAN" "DOMPrint - Win32 ReleaseCLEAN" "DOMTest - Win32 ReleaseCLEAN" "EncodingTest - Win32 ReleaseCLEAN" "EnumVal - Win32 ReleaseCLEAN" "InitTermTest - Win32 ReleaseCLEAN" "MemParse - Win32 ReleaseCLEAN" "PParse - Win32 ReleaseCLEAN" "RangeTest - Win32 ReleaseCLEAN" "Redirect - Win32 ReleaseCLEAN" "SAX2Count - Win32 ReleaseCLEAN" "SAX2Print - Win32 ReleaseCLEAN" "SAXCount - Win32 ReleaseCLEAN" "SAXPrint - Win32 ReleaseCLEAN" "SEnumVal - Win32 ReleaseCLEAN" "StdInParse - Win32 ReleaseCLEAN" "ThreadTest - Win32 ReleaseCLEAN" "XSerializerTest - Win32 ReleaseCLEAN" "MemHandlerTest - Win32 ReleaseCLEAN" "XercesLib - Win32 ReleaseCLEAN" "DOMTraversalTest - Win32 ReleaseCLEAN" "DeprecatedDOMCount - Win64 ReleaseCLEAN" "DOMTypeInfoTest - Win64 ReleaseCLEAN" "DOMNormalizerTest - Win64 ReleaseCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -996,16 +996,6 @@ MTL_PROJ=
    $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\ThreadTest.mak" CFG="ThreadTest - Win32 Release" RECURSE=1 CLEAN 
    cd "..\all"
 
-"MemHandlerTest - Win32 Release" : 
-   cd "..\MemHandlerTest"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\MemHandlerTest.mak" CFG="MemHandlerTest - Win32 Release" 
-   cd "..\all"
-
-"MemHandlerTest - Win32 ReleaseCLEAN" : 
-   cd "..\MemHandlerTest"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\MemHandlerTest.mak" CFG="MemHandlerTest - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\all"
-
 !ELSEIF  "$(CFG)" == "all - Win32 Debug"
 
 "ThreadTest - Win32 Debug" : 
@@ -1018,16 +1008,6 @@ MTL_PROJ=
    $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\ThreadTest.mak" CFG="ThreadTest - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\all"
 
-"MemHandlerTest - Win32 Debug" : 
-   cd "..\MemHandlerTest"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\MemHandlerTest.mak" CFG="MemHandlerTest - Win32 Debug" 
-   cd "..\all"
-
-"MemHandlerTest - Win32 DebugCLEAN" : 
-   cd "..\MemHandlerTest"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\MemHandlerTest.mak" CFG="MemHandlerTest - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\all"
-
 !ELSEIF  "$(CFG)" == "all - Win64 Debug"
 
 "ThreadTest - Win64 Debug" : 
@@ -1040,16 +1020,6 @@ MTL_PROJ=
    $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\ThreadTest.mak" CFG="ThreadTest - Win64 Debug" RECURSE=1 CLEAN 
    cd "..\all"
 
-"MemHandlerTest - Win64 Debug" : 
-   cd "..\MemHandlerTest"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\MemHandlerTest.mak" CFG="MemHandlerTest - Win64 Debug" 
-   cd "..\all"
-
-"MemHandlerTest - Win64 DebugCLEAN" : 
-   cd "..\MemHandlerTest"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\MemHandlerTest.mak" CFG="MemHandlerTest - Win64 Debug" RECURSE=1 CLEAN 
-   cd "..\all"
-
 !ELSEIF  "$(CFG)" == "all - Win64 Release"
 
 "ThreadTest - Win64 Release" : 
@@ -1062,6 +1032,96 @@ MTL_PROJ=
    $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\ThreadTest.mak" CFG="ThreadTest - Win64 Release" RECURSE=1 CLEAN 
    cd "..\all"
 
+!ENDIF 
+
+!IF  "$(CFG)" == "all - Win32 Release"
+
+"XSerializerTest - Win32 Release" : 
+   cd "..\XSerializerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSerializerTest.mak" CFG="XSerializerTest - Win32 Release" 
+   cd "..\all"
+
+"XSerializerTest - Win32 ReleaseCLEAN" : 
+   cd "..\XSerializerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSerializerTest.mak" CFG="XSerializerTest - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\all"
+
+!ELSEIF  "$(CFG)" == "all - Win32 Debug"
+
+"XSerializerTest - Win32 Debug" : 
+   cd "..\XSerializerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSerializerTest.mak" CFG="XSerializerTest - Win32 Debug" 
+   cd "..\all"
+
+"XSerializerTest - Win32 DebugCLEAN" : 
+   cd "..\XSerializerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSerializerTest.mak" CFG="XSerializerTest - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\all"
+
+!ELSEIF  "$(CFG)" == "all - Win64 Debug"
+
+"XSerializerTest - Win64 Debug" : 
+   cd "..\XSerializerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSerializerTest.mak" CFG="XSerializerTest - Win64 Debug" 
+   cd "..\all"
+
+"XSerializerTest - Win64 DebugCLEAN" : 
+   cd "..\XSerializerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSerializerTest.mak" CFG="XSerializerTest - Win64 Debug" RECURSE=1 CLEAN 
+   cd "..\all"
+
+!ELSEIF  "$(CFG)" == "all - Win64 Release"
+
+"XSerializerTest - Win64 Release" : 
+   cd "..\XSerializerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSerializerTest.mak" CFG="XSerializerTest - Win64 Release" 
+   cd "..\all"
+
+"XSerializerTest - Win64 ReleaseCLEAN" : 
+   cd "..\XSerializerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSerializerTest.mak" CFG="XSerializerTest - Win64 Release" RECURSE=1 CLEAN 
+   cd "..\all"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "all - Win32 Release"
+
+"MemHandlerTest - Win32 Release" : 
+   cd "..\MemHandlerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\MemHandlerTest.mak" CFG="MemHandlerTest - Win32 Release" 
+   cd "..\all"
+
+"MemHandlerTest - Win32 ReleaseCLEAN" : 
+   cd "..\MemHandlerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\MemHandlerTest.mak" CFG="MemHandlerTest - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\all"
+
+!ELSEIF  "$(CFG)" == "all - Win32 Debug"
+
+"MemHandlerTest - Win32 Debug" : 
+   cd "..\MemHandlerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\MemHandlerTest.mak" CFG="MemHandlerTest - Win32 Debug" 
+   cd "..\all"
+
+"MemHandlerTest - Win32 DebugCLEAN" : 
+   cd "..\MemHandlerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\MemHandlerTest.mak" CFG="MemHandlerTest - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\all"
+
+!ELSEIF  "$(CFG)" == "all - Win64 Debug"
+
+"MemHandlerTest - Win64 Debug" : 
+   cd "..\MemHandlerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\MemHandlerTest.mak" CFG="MemHandlerTest - Win64 Debug" 
+   cd "..\all"
+
+"MemHandlerTest - Win64 DebugCLEAN" : 
+   cd "..\MemHandlerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\MemHandlerTest.mak" CFG="MemHandlerTest - Win64 Debug" RECURSE=1 CLEAN 
+   cd "..\all"
+
+!ELSEIF  "$(CFG)" == "all - Win64 Release"
+
 "MemHandlerTest - Win64 Release" : 
    cd "..\MemHandlerTest"
    $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\MemHandlerTest.mak" CFG="MemHandlerTest - Win64 Release" 
@@ -1176,6 +1236,56 @@ MTL_PROJ=
 
 !IF  "$(CFG)" == "all - Win32 Release"
 
+"DeprecatedDOMCount - Win32 Release" : 
+   cd "..\DeprecatedDOMCount"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DeprecatedDOMCount.mak" CFG="DeprecatedDOMCount - Win32 Release" 
+   cd "..\all"
+
+"DeprecatedDOMCount - Win32 ReleaseCLEAN" : 
+   cd "..\DeprecatedDOMCount"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DeprecatedDOMCount.mak" CFG="DeprecatedDOMCount - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\all"
+
+!ELSEIF  "$(CFG)" == "all - Win32 Debug"
+
+"DeprecatedDOMCount - Win32 Debug" : 
+   cd "..\DeprecatedDOMCount"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DeprecatedDOMCount.mak" CFG="DeprecatedDOMCount - Win32 Debug" 
+   cd "..\all"
+
+"DeprecatedDOMCount - Win32 DebugCLEAN" : 
+   cd "..\DeprecatedDOMCount"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DeprecatedDOMCount.mak" CFG="DeprecatedDOMCount - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\all"
+
+!ELSEIF  "$(CFG)" == "all - Win64 Debug"
+
+"DeprecatedDOMCount - Win64 Debug" : 
+   cd "..\DeprecatedDOMCount"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DeprecatedDOMCount.mak" CFG="DeprecatedDOMCount - Win64 Debug" 
+   cd "..\all"
+
+"DeprecatedDOMCount - Win64 DebugCLEAN" : 
+   cd "..\DeprecatedDOMCount"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DeprecatedDOMCount.mak" CFG="DeprecatedDOMCount - Win64 Debug" RECURSE=1 CLEAN 
+   cd "..\all"
+
+!ELSEIF  "$(CFG)" == "all - Win64 Release"
+
+"DeprecatedDOMCount - Win64 Release" : 
+   cd "..\DeprecatedDOMCount"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DeprecatedDOMCount.mak" CFG="DeprecatedDOMCount - Win64 Release" 
+   cd "..\all"
+
+"DeprecatedDOMCount - Win64 ReleaseCLEAN" : 
+   cd "..\DeprecatedDOMCount"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DeprecatedDOMCount.mak" CFG="DeprecatedDOMCount - Win64 Release" RECURSE=1 CLEAN 
+   cd "..\all"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "all - Win32 Release"
+
 "DOMTypeInfoTest - Win32 Release" : 
    cd "..\DOMTypeInfoTest"
    $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DOMTypeInfoTest.mak" CFG="DOMTypeInfoTest - Win32 Release" 
@@ -1226,50 +1336,50 @@ MTL_PROJ=
 
 !IF  "$(CFG)" == "all - Win32 Release"
 
-"DeprecatedDOMCount - Win32 Release" : 
-   cd "..\DeprecatedDOMCount"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DeprecatedDOMCount.mak" CFG="DeprecatedDOMCount - Win32 Release" 
+"DOMNormalizerTest - Win32 Release" : 
+   cd "..\DOMNormalizerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DOMNormalizerTest.mak" CFG="DOMNormalizerTest - Win32 Release" 
    cd "..\all"
 
-"DeprecatedDOMCount - Win32 ReleaseCLEAN" : 
-   cd "..\DeprecatedDOMCount"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DeprecatedDOMCount.mak" CFG="DeprecatedDOMCount - Win32 Release" RECURSE=1 CLEAN 
+"DOMNormalizerTest - Win32 ReleaseCLEAN" : 
+   cd "..\DOMNormalizerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DOMNormalizerTest.mak" CFG="DOMNormalizerTest - Win32 Release" RECURSE=1 CLEAN 
    cd "..\all"
 
 !ELSEIF  "$(CFG)" == "all - Win32 Debug"
 
-"DeprecatedDOMCount - Win32 Debug" : 
-   cd "..\DeprecatedDOMCount"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DeprecatedDOMCount.mak" CFG="DeprecatedDOMCount - Win32 Debug" 
+"DOMNormalizerTest - Win32 Debug" : 
+   cd "..\DOMNormalizerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DOMNormalizerTest.mak" CFG="DOMNormalizerTest - Win32 Debug" 
    cd "..\all"
 
-"DeprecatedDOMCount - Win32 DebugCLEAN" : 
-   cd "..\DeprecatedDOMCount"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DeprecatedDOMCount.mak" CFG="DeprecatedDOMCount - Win32 Debug" RECURSE=1 CLEAN 
+"DOMNormalizerTest - Win32 DebugCLEAN" : 
+   cd "..\DOMNormalizerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DOMNormalizerTest.mak" CFG="DOMNormalizerTest - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\all"
 
 !ELSEIF  "$(CFG)" == "all - Win64 Debug"
 
-"DeprecatedDOMCount - Win64 Debug" : 
-   cd "..\DeprecatedDOMCount"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DeprecatedDOMCount.mak" CFG="DeprecatedDOMCount - Win64 Debug" 
+"DOMNormalizerTest - Win64 Debug" : 
+   cd "..\DOMNormalizerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DOMNormalizerTest.mak" CFG="DOMNormalizerTest - Win64 Debug" 
    cd "..\all"
 
-"DeprecatedDOMCount - Win64 DebugCLEAN" : 
-   cd "..\DeprecatedDOMCount"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DeprecatedDOMCount.mak" CFG="DeprecatedDOMCount - Win64 Debug" RECURSE=1 CLEAN 
+"DOMNormalizerTest - Win64 DebugCLEAN" : 
+   cd "..\DOMNormalizerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DOMNormalizerTest.mak" CFG="DOMNormalizerTest - Win64 Debug" RECURSE=1 CLEAN 
    cd "..\all"
 
 !ELSEIF  "$(CFG)" == "all - Win64 Release"
 
-"DeprecatedDOMCount - Win64 Release" : 
-   cd "..\DeprecatedDOMCount"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DeprecatedDOMCount.mak" CFG="DeprecatedDOMCount - Win64 Release" 
+"DOMNormalizerTest - Win64 Release" : 
+   cd "..\DOMNormalizerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DOMNormalizerTest.mak" CFG="DOMNormalizerTest - Win64 Release" 
    cd "..\all"
 
-"DeprecatedDOMCount - Win64 ReleaseCLEAN" : 
-   cd "..\DeprecatedDOMCount"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DeprecatedDOMCount.mak" CFG="DeprecatedDOMCount - Win64 Release" RECURSE=1 CLEAN 
+"DOMNormalizerTest - Win64 ReleaseCLEAN" : 
+   cd "..\DOMNormalizerTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\DOMNormalizerTest.mak" CFG="DOMNormalizerTest - Win64 Release" RECURSE=1 CLEAN 
    cd "..\all"
 
 !ENDIF