From 321a4fb67414f97af0898aa6a6450c025d808c72 Mon Sep 17 00:00:00 2001
From: Alberto Massari <amassari@apache.org>
Date: Fri, 2 Mar 2007 09:02:50 +0000
Subject: [PATCH] Makefile integration for XInclude

git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@513666 13f79535-47bb-0310-9956-ffa450edef68
---
 .../BCB6/Xerces-all/XercesLib/XercesLib.bpr   |  15 +-
 .../Xerces-all/XercesLib/XercesLib.mak        |  11 +-
 .../CreateDOMDocument/CreateDOMDocument.mak   | 159 ++-----
 .../VC6/xerces-all/DOMCount/DOMCount.mak      | 159 ++-----
 .../VC6/xerces-all/DOMMemTest/DOMMemTest.mak  | 159 ++-----
 .../DOMNormalizerTest/DOMNormalizerTest.mak   | 159 ++-----
 .../VC6/xerces-all/DOMPrint/DOMPrint.mak      | 447 ++++++++++--------
 .../Win32/VC6/xerces-all/DOMTest/DOMTest.mak  | 159 ++-----
 .../DOMTraversalTest/DOMTraversalTest.mak     | 159 ++-----
 .../DOMTypeInfoTest/DOMTypeInfoTest.mak       | 291 ++++--------
 .../xerces-all/EncodingTest/EncodingTest.mak  | 159 ++-----
 .../Win32/VC6/xerces-all/EnumVal/EnumVal.mak  | 159 ++-----
 .../xerces-all/InitTermTest/InitTermTest.mak  | 159 ++-----
 .../MemHandlerTest/MemHandlerTest.mak         | 233 ++-------
 .../VC6/xerces-all/MemParse/MemParse.mak      | 163 ++-----
 .../Win32/VC6/xerces-all/PParse/PParse.mak    | 163 ++-----
 .../VC6/xerces-all/PSVIWriter/PSVIWriter.mak  | 105 ++--
 .../VC6/xerces-all/RangeTest/RangeTest.mak    | 159 ++-----
 .../VC6/xerces-all/Redirect/Redirect.mak      | 163 ++-----
 .../VC6/xerces-all/SAX2Count/SAX2Count.mak    | 163 ++-----
 .../VC6/xerces-all/SAX2Print/SAX2Print.mak    | 181 ++-----
 .../VC6/xerces-all/SAXCount/SAXCount.mak      | 163 ++-----
 .../VC6/xerces-all/SAXPrint/SAXPrint.mak      | 163 ++-----
 .../VC6/xerces-all/SCMPrint/SCMPrint.mak      |  28 +-
 .../VC6/xerces-all/SEnumVal/SEnumVal.mak      | 341 ++++++-------
 .../VC6/xerces-all/StdInParse/StdInParse.mak  | 163 ++-----
 .../VC6/xerces-all/ThreadTest/ThreadTest.mak  | 159 ++-----
 .../VC6/xerces-all/XInclude/XInclude.dsp      | 146 ++++++
 .../VC6/xerces-all/XInclude/XInclude.mak      | 381 +++++++++++++++
 .../xerces-all/XSValueTest/XSValueTest.mak    | 159 ++-----
 .../XSerializerTest/XSerializerTest.mak       | 163 ++-----
 .../VC6/xerces-all/XercesLib/XercesLib.dsp    |  33 ++
 .../VC6/xerces-all/XercesLib/XercesLib.mak    | 313 ++++++------
 Projects/Win32/VC6/xerces-all/all/all.mak     | 195 ++++----
 Projects/Win32/VC6/xerces-all/xerces-all.dsw  |  18 +
 .../VC6/xerces-all/xerces-com/xerces-com.mak  | 315 ++++++------
 .../DOMNormalizerTest.vcproj                  |   2 +-
 .../VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj |   4 +-
 .../VC7.1/xerces-all/XInclude/XInclude.vcproj | 262 ++++++++++
 .../xerces-all/XercesLib/XercesLib.vcproj     |  26 +-
 .../Win32/VC7.1/xerces-all/xerces-all.sln     |  41 +-
 .../DOMNormalizerTest.vcproj                  |   2 +-
 .../VC8/xerces-all/XInclude/XInclude.vcproj   | 380 +++++++++++++++
 Projects/Win32/VC8/xerces-all/xerces-all.sln  |  31 +-
 samples/Makefile.am                           |   2 +
 samples/Makefile.in                           |  32 +-
 src/Makefile.am                               |  15 +
 src/Makefile.in                               | 152 ++++--
 48 files changed, 3124 insertions(+), 4090 deletions(-)
 create mode 100644 Projects/Win32/VC6/xerces-all/XInclude/XInclude.dsp
 create mode 100644 Projects/Win32/VC6/xerces-all/XInclude/XInclude.mak
 create mode 100644 Projects/Win32/VC7.1/xerces-all/XInclude/XInclude.vcproj
 create mode 100644 Projects/Win32/VC8/xerces-all/XInclude/XInclude.vcproj

diff --git a/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr b/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
index 8e0acab02..48dad9799 100644
--- a/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
+++ b/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
@@ -306,7 +306,10 @@
       ..\..\..\..\..\Build\Win32\BCB6\obj\DOMLSInputImpl.obj
       ..\..\..\..\..\Build\Win32\BCB6\obj\DOMXPathExpressionImpl.obj
       ..\..\..\..\..\Build\Win32\BCB6\obj\DOMXPathNSResolverImpl.obj
-      ..\..\..\..\..\Build\Win32\BCB6\obj\DOMXPathResultImpl.obj"/>
+      ..\..\..\..\..\Build\Win32\BCB6\obj\DOMXPathResultImpl.obj
+      ..\..\..\..\..\Build\Win32\BCB6\obj\XIncludeDOMDocumentProcessor.obj
+      ..\..\..\..\..\Build\Win32\BCB6\obj\XIncludeLocation.obj
+      ..\..\..\..\..\Build\Win32\BCB6\obj\XIncludeUtils.obj"/>
     <RESFILES value=""/>
     <IDLFILES value=""/>
     <IDLGENFILES value=""/>
@@ -316,7 +319,7 @@
     <LIBRARIES value=""/>
     <SPARELIBS value="rtl.lib"/>
     <PACKAGES value="vcl.bpi rtl.bpi"/>
-    <PATHCPP value=".;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework\psvi"/>
+    <PATHCPP value=".;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\xinclude"/>
     <PATHPAS value=".;"/>
     <PATHRC value=".;"/>
     <PATHASM value=".;"/>
@@ -326,8 +329,8 @@
     <USERDEFINES value="_DEBUG;PLATFORM_WIN32;XERCES_BUILDING_LIBRARY;XERCES_PATH_DELIMITER_BACKSLASH=1;XERCES_USE_FILEMGR_WINDOWS=1;XERCES_USE_MUTEXMGR_WINDOWS=1;XERCES_USE_ATOMICOPMGR_WINDOWS=1;XERCES_USE_NETACCESSOR_WINSOCK=1;XERCES_USE_TRANSCODER_WINDOWS=1;XERCES_USE_MSGLOADER_INMEMORY=1;HAVE_LIMITS_H=1;HAVE_FTIME=1;HAVE_SYS_TIMEB_H=1;HAVE_STRICMP=1;HAVE_STRNICMP=1;HAVE_WCSUPR=1;HAVE_WCSLWR=1;HAVE_WCSICMP=1;HAVE_WCSNICMP=1;"/>
     <SYSDEFINES value="NO_STRICT;_RTLDLL;USEPACKAGES"/>
     <MAINSOURCE value="Xerceslib.cpp"/>
-    <INCLUDEPATH value="..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src;$(BCB)\include"/>
-    <LIBPATH value="..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <INCLUDEPATH value="..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src;..\..\..\..\..\src\xercesc\xinclude;$(BCB)\include"/>
+    <LIBPATH value="..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src;..\..\..\..\..\src\xercesc\xinclude;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par -w-8027 -w-8026"/>
     <OTHERFILES value=""/>
   </MACROS>
@@ -350,6 +353,7 @@
       -I..\..\..\..\..\src\xercesc\util\AtomicOpManagers 
       -I..\..\..\..\..\src\xercesc\util\FileManagers 
       -I..\..\..\..\..\src\xercesc\util\MutexManagers -I..\..\..\..\..\src 
+      -I..\..\..\..\..\src\xercesc\xinclude
       -I$(BCB)\include -src_suffix cpp -D_DEBUG -DPLATFORM_WIN32 
       -DXERCES_BUILDING_LIBRARY -DXERCES_PATH_DELIMITER_BACKSLASH=1 
       -DXERCES_USE_FILEMGR_WINDOWS=1 -DXERCES_USE_MUTEXMGR_WINDOWS=1 
@@ -676,6 +680,9 @@
       <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\impl\DOMXPathExpressionImpl.cpp" FORMNAME="" UNITNAME="DOMXPathExpressionImpl.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\impl\DOMXPathNSResolverImpl.cpp" FORMNAME="" UNITNAME="DOMXPathNSResolverImpl.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\impl\DOMXPathResultImpl.cpp" FORMNAME="" UNITNAME="DOMXPathResultImpl.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\..\..\..\src\xercesc\xinclude\XIncludeDOMDocumentProcessor.cpp" FORMNAME="" UNITNAME="XIncludeDOMDocumentProcessor.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\..\..\..\src\xercesc\xinclude\XIncludeLocation.cpp" FORMNAME="" UNITNAME="XIncludeLocation.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\..\..\..\src\xercesc\xinclude\XIncludeUtils.cpp" FORMNAME="" UNITNAME="XIncludeUtils.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
   </FILELIST>
   <BUILDTOOLS>
   </BUILDTOOLS>
diff --git a/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak b/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
index fc8dc5dc5..45cc2fbae 100644
--- a/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
+++ b/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
@@ -308,7 +308,10 @@ OBJFILES = $(TARGETPATH)\obj\XercesLib.obj \
     $(TARGETPATH)\obj\WindowsMutexMgr.obj \
     $(TARGETPATH)\obj\DOMXPathExpressionImpl.obj \
     $(TARGETPATH)\obj\DOMXPathNSResolverImpl.obj \
-    $(TARGETPATH)\obj\DOMXPathResultImpl.obj
+    $(TARGETPATH)\obj\DOMXPathResultImpl.obj \
+    $(TARGETPATH)\obj\XIncludeDOMDocumentProcessor.obj \
+    $(TARGETPATH)\obj\XIncludeLocation.obj \
+    $(TARGETPATH)\obj\XIncludeUtils.obj
 RESFILES = 
 MAINSOURCE = XercesLib.cpp
 RESDEPEN = $(RESFILES)
@@ -319,7 +322,7 @@ LIBRARIES =
 SPARELIBS =
 DEFFILE =
 # ---------------------------------------------------------------------------
-PATHCPP = .;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;
+PATHCPP = .;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\xinclude;
 PATHASM = .;
 PATHPAS = .;
 PATHRC = .;..\..\..\..\..\src\xercesc\util\Platforms\Win32
@@ -328,8 +331,8 @@ XERCES_NO_ASM=;XERCES_NO_ASM
 !endif
 USERDEFINES = _DEBUG;XERCES_BUILDING_LIBRARY;XERCES_USE_FILEMGR_WINDOWS=1;XERCES_USE_MUTEXMGR_WINDOWS=1;XERCES_USE_ATOMICOPMGR_WINDOWS=1;XERCES_USE_NETACCESSOR_WINSOCK=1;XERCES_USE_MSGLOADER_INMEMORY=1;XERCES_USE_TRANSCODER_WINDOWS=1;XERCES_PATH_DELIMITER_BACKSLASH=1;HAVE_LIMITS_H=1;HAVE_SYS_TIMEB_H=1;HAVE_FTIME=1;HAVE_STRICMP=1;HAVE_STRNICMP=1;HAVE_WCSUPR=1;HAVE_WCSLWR=1;HAVE_WCSICMP=1;HAVE_WCSNICMP=1;$(XERCES_NO_ASM)
 SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
-INCLUDEPATH = ..\..\..\..\..\src;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;
-LIBPATH = ..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;
+INCLUDEPATH = ..\..\..\..\..\src;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\xinclude;
+LIBPATH = ..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\xinclude;
 WARNINGS= -w-par
 # ---------------------------------------------------------------------------
 CFLAG1 = -tWD -Od -Vx -Ve -X- -r- -a8 -4 -b -k -y -v -vi- -c -tWM
diff --git a/Projects/Win32/VC6/xerces-all/CreateDOMDocument/CreateDOMDocument.mak b/Projects/Win32/VC6/xerces-all/CreateDOMDocument/CreateDOMDocument.mak
index cdc677d82..aee3be301 100644
--- a/Projects/Win32/VC6/xerces-all/CreateDOMDocument/CreateDOMDocument.mak
+++ b/Projects/Win32/VC6/xerces-all/CreateDOMDocument/CreateDOMDocument.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "CreateDOMDocument - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -61,49 +64,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "_CONSOLE" /D "NDEBUG" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\CreateDOMDocument.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /machine:I386 /out:"$(OUTDIR)\CreateDOMDocument.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /machine:I386 /out:"$(OUTDIR)\CreateDOMDocument.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\CreateDOMDocument.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\CreateDOMDocument.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -146,49 +116,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_CONSOLE" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\CreateDOMDocument.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /debug /machine:I386 /out:"$(OUTDIR)\CreateDOMDocument.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /debug /machine:I386 /out:"$(OUTDIR)\CreateDOMDocument.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\CreateDOMDocument.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\CreateDOMDocument.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -231,49 +168,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CONSOLE" /D "_DEBUG" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\CreateDOMDocument.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\CreateDOMDocument.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\CreateDOMDocument.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\CreateDOMDocument.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\CreateDOMDocument.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -314,8 +218,23 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "_CONSOLE" /D "NDEBUG" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\CreateDOMDocument.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /machine:IX86 /out:"$(OUTDIR)\CreateDOMDocument.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\CreateDOMDocument.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\CreateDOMDocument.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -347,24 +266,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "_CONSOLE" /
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\CreateDOMDocument.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /machine:IX86 /out:"$(OUTDIR)\CreateDOMDocument.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\CreateDOMDocument.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\CreateDOMDocument.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("CreateDOMDocument.dep")
@@ -427,7 +328,7 @@ LINK32_OBJS= \
 
 !ENDIF 
 
-SOURCE=..\..\..\..\..\samples\CreateDOMDocument\CreateDOMDocument.cpp
+SOURCE=..\..\..\..\..\samples\src\CreateDOMDocument\CreateDOMDocument.cpp
 
 "$(INTDIR)\CreateDOMDocument.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/DOMCount/DOMCount.mak b/Projects/Win32/VC6/xerces-all/DOMCount/DOMCount.mak
index 321890777..66bc56c9b 100644
--- a/Projects/Win32/VC6/xerces-all/DOMCount/DOMCount.mak
+++ b/Projects/Win32/VC6/xerces-all/DOMCount/DOMCount.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "DOMCount - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -61,49 +64,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\DOMCount.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMCount.pdb" /machine:I386 /out:"$(OUTDIR)\DOMCount.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMCount.pdb" /machine:I386 /out:"$(OUTDIR)\DOMCount.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\DOMCount.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\DOMCount.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -146,49 +116,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\DOMCount.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMCount.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMCount.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMCount.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMCount.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\DOMCount.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\DOMCount.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -231,49 +168,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\DOMCount.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMCount.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMCount.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMCount.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMCount.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\DOMCount.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\DOMCount.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -314,8 +218,23 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\DOMCount.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMCount.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMCount.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\DOMCount.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\DOMCount.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -347,24 +266,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "_CONSOLE" /
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMCount.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMCount.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMCount.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\DOMCount.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\DOMCount.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("DOMCount.dep")
@@ -427,7 +328,7 @@ LINK32_OBJS= \
 
 !ENDIF 
 
-SOURCE=..\..\..\..\..\samples\DOMCount\DOMCount.cpp
+SOURCE=..\..\..\..\..\samples\src\DOMCount\DOMCount.cpp
 
 "$(INTDIR)\DOMCount.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/DOMMemTest/DOMMemTest.mak b/Projects/Win32/VC6/xerces-all/DOMMemTest/DOMMemTest.mak
index 1e270f789..d40f5508a 100644
--- a/Projects/Win32/VC6/xerces-all/DOMMemTest/DOMMemTest.mak
+++ b/Projects/Win32/VC6/xerces-all/DOMMemTest/DOMMemTest.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "DOMMemTest - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -60,49 +63,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\DOMMemTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\DOMMemTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMMemTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\DOMMemTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMMemTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\DOMMemTest.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\DOMMemTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -145,49 +115,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\DOMMemTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMMemTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMMemTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMMemTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMMemTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\DOMMemTest.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\DOMMemTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -230,49 +167,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\DOMMemTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMMemTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMMemTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMMemTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMMemTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\DOMMemTest.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\DOMMemTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -313,8 +217,23 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\DOMMemTest.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMMemTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMMemTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\DOMMemTest.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\DOMMemTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -346,24 +265,6 @@ CPP_PROJ=/MD /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CO
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMMemTest.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMMemTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMMemTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\DOMMemTest.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\DOMMemTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("DOMMemTest.dep")
@@ -375,7 +276,7 @@ LINK32_OBJS= \
 
 
 !IF "$(CFG)" == "DOMMemTest - Win32 Release" || "$(CFG)" == "DOMMemTest - Win32 Debug" || "$(CFG)" == "DOMMemTest - Win64 Debug" || "$(CFG)" == "DOMMemTest - Win64 Release"
-SOURCE=..\..\..\..\..\tests\DOM\DOMMemTest\DOMMemTest.cpp
+SOURCE=..\..\..\..\..\tests\src\DOM\DOMMemTest\DOMMemTest.cpp
 
 "$(INTDIR)\DOMMemTest.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/DOMNormalizerTest/DOMNormalizerTest.mak b/Projects/Win32/VC6/xerces-all/DOMNormalizerTest/DOMNormalizerTest.mak
index dc51705e0..cb205dc7e 100644
--- a/Projects/Win32/VC6/xerces-all/DOMNormalizerTest/DOMNormalizerTest.mak
+++ b/Projects/Win32/VC6/xerces-all/DOMNormalizerTest/DOMNormalizerTest.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "DOMNormalizerTest - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -60,49 +63,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\DOMNormalizerTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\DOMNormalizerTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMNormalizerTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\DOMNormalizerTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMNormalizerTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\Normalizer.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\DOMNormalizerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -145,49 +115,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\DOMNormalizerTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMNormalizerTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMNormalizerTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMNormalizerTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMNormalizerTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\Normalizer.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\DOMNormalizerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -230,49 +167,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\DOMNormalizerTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMNormalizerTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMNormalizerTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMNormalizerTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMNormalizerTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\Normalizer.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\DOMNormalizerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -313,8 +217,23 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\DOMNormalizerTest.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMNormalizerTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMNormalizerTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\Normalizer.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\DOMNormalizerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -346,24 +265,6 @@ CPP_PROJ=/MD /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CO
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMNormalizerTest.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMNormalizerTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMNormalizerTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\Normalizer.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\DOMNormalizerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("DOMNormalizerTest.dep")
@@ -375,7 +276,7 @@ LINK32_OBJS= \
 
 
 !IF "$(CFG)" == "DOMNormalizerTest - Win32 Release" || "$(CFG)" == "DOMNormalizerTest - Win32 Debug" || "$(CFG)" == "DOMNormalizerTest - Win64 Debug" || "$(CFG)" == "DOMNormalizerTest - Win64 Release"
-SOURCE=..\..\..\..\..\tests\DOM\Normalizer\Normalizer.cpp
+SOURCE=..\..\..\..\..\tests\src\DOM\Normalizer\Normalizer.cpp
 
 "$(INTDIR)\Normalizer.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/DOMPrint/DOMPrint.mak b/Projects/Win32/VC6/xerces-all/DOMPrint/DOMPrint.mak
index 1c77a79d2..6e4de9188 100644
--- a/Projects/Win32/VC6/xerces-all/DOMPrint/DOMPrint.mak
+++ b/Projects/Win32/VC6/xerces-all/DOMPrint/DOMPrint.mak
@@ -2,30 +2,33 @@
 !IF "$(CFG)" == ""
 CFG=DOMPrint - Win32 Debug
 !MESSAGE No configuration specified. Defaulting to DOMPrint - Win32 Debug.
-!ENDIF
+!ENDIF 
 
 !IF "$(CFG)" != "DOMPrint - Win32 Release" && "$(CFG)" != "DOMPrint - Win32 Debug" && "$(CFG)" != "DOMPrint - Win64 Debug" && "$(CFG)" != "DOMPrint - Win64 Release"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "DOMPrint.mak" CFG="DOMPrint - Win32 Debug"
-!MESSAGE
+!MESSAGE 
 !MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE 
 !MESSAGE "DOMPrint - Win32 Release" (based on "Win32 (x86) Console Application")
 !MESSAGE "DOMPrint - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE "DOMPrint - Win64 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE "DOMPrint - Win64 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE 
 !ERROR An invalid configuration is specified.
-!ENDIF
+!ENDIF 
 
 !IF "$(OS)" == "Windows_NT"
 NULL=
-!ELSE
+!ELSE 
 NULL=nul
-!ENDIF
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
 
 !IF  "$(CFG)" == "DOMPrint - Win32 Release"
 
@@ -35,25 +38,31 @@ INTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release\obj
 OutDir=.\..\..\..\..\..\Build\Win32\VC6\Release
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0" 
 
-ALL : "$(OUTDIR)\DOMPrint.exe"
+ALL : "$(OUTDIR)\DOMPrint.exe" "$(OUTDIR)\DOMPrint.bsc"
+
+!ELSE 
 
-!ELSE
+ALL : "XercesLib - Win32 Release" "$(OUTDIR)\DOMPrint.exe" "$(OUTDIR)\DOMPrint.bsc"
 
-ALL : "XercesLib - Win32 Release" "$(OUTDIR)\DOMPrint.exe"
-!ENDIF
+!ENDIF 
 
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win32 ReleaseCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1" 
+CLEAN :"XercesLib - Win32 ReleaseCLEAN" 
+!ELSE 
 CLEAN :
-!ENDIF
+!ENDIF 
 	-@erase "$(INTDIR)\DOMPrint.obj"
+	-@erase "$(INTDIR)\DOMPrint.sbr"
 	-@erase "$(INTDIR)\DOMPrintErrorHandler.obj"
+	-@erase "$(INTDIR)\DOMPrintErrorHandler.sbr"
 	-@erase "$(INTDIR)\DOMPrintFilter.obj"
+	-@erase "$(INTDIR)\DOMPrintFilter.sbr"
 	-@erase "$(INTDIR)\DOMTreeErrorReporter.obj"
+	-@erase "$(INTDIR)\DOMTreeErrorReporter.sbr"
 	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(OUTDIR)\DOMPrint.bsc"
 	-@erase "$(OUTDIR)\DOMPrint.exe"
 	-@erase "$(OUTDIR)\DOMPrint.ilk"
 
@@ -63,52 +72,28 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMPrint.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\DOMPrint.bsc" 
 BSC32_SBRS= \
+	"$(INTDIR)\DOMPrint.sbr" \
+	"$(INTDIR)\DOMPrintErrorHandler.sbr" \
+	"$(INTDIR)\DOMPrintFilter.sbr" \
+	"$(INTDIR)\DOMTreeErrorReporter.sbr"
+
+"$(OUTDIR)\DOMPrint.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
 
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMPrint.pdb" /machine:I386 /out:"$(OUTDIR)\DOMPrint.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMPrint.pdb" /machine:I386 /out:"$(OUTDIR)\DOMPrint.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\DOMPrint.obj" \
 	"$(INTDIR)\DOMPrintErrorHandler.obj" \
 	"$(INTDIR)\DOMPrintFilter.obj" \
 	"$(INTDIR)\DOMTreeErrorReporter.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\DOMPrint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -123,21 +108,21 @@ INTDIR=.\..\..\..\..\..\Build\Win32\VC6\Debug\obj
 OutDir=.\..\..\..\..\..\Build\Win32\VC6\Debug
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0" 
 
 ALL : "$(OUTDIR)\DOMPrint.exe"
 
-!ELSE
+!ELSE 
 
 ALL : "XercesLib - Win32 Debug" "$(OUTDIR)\DOMPrint.exe"
 
-!ENDIF
+!ENDIF 
 
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win32 DebugCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1" 
+CLEAN :"XercesLib - Win32 DebugCLEAN" 
+!ELSE 
 CLEAN :
-!ENDIF
+!ENDIF 
 	-@erase "$(INTDIR)\DOMPrint.obj"
 	-@erase "$(INTDIR)\DOMPrintErrorHandler.obj"
 	-@erase "$(INTDIR)\DOMPrintFilter.obj"
@@ -154,52 +139,19 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMPrint.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\DOMPrint.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMPrint.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMPrint.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMPrint.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMPrint.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\DOMPrint.obj" \
 	"$(INTDIR)\DOMPrintErrorHandler.obj" \
 	"$(INTDIR)\DOMPrintFilter.obj" \
 	"$(INTDIR)\DOMTreeErrorReporter.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\DOMPrint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -214,21 +166,21 @@ INTDIR=.\..\..\..\..\..\Build\Win64\VC6\Debug\obj
 OutDir=.\..\..\..\..\..\Build\Win64\VC6\Debug
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0" 
 
 ALL : "$(OUTDIR)\DOMPrint.exe"
 
-!ELSE
+!ELSE 
 
 ALL : "XercesLib - Win64 Debug" "$(OUTDIR)\DOMPrint.exe"
 
-!ENDIF
+!ENDIF 
 
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win64 DebugCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1" 
+CLEAN :"XercesLib - Win64 DebugCLEAN" 
+!ELSE 
 CLEAN :
-!ENDIF
+!ENDIF 
 	-@erase "$(INTDIR)\DOMPrint.obj"
 	-@erase "$(INTDIR)\DOMPrintErrorHandler.obj"
 	-@erase "$(INTDIR)\DOMPrintFilter.obj"
@@ -245,52 +197,19 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMPrint.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\DOMPrint.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMPrint.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMPrint.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMPrint.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMPrint.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\DOMPrint.obj" \
 	"$(INTDIR)\DOMPrintErrorHandler.obj" \
 	"$(INTDIR)\DOMPrintFilter.obj" \
 	"$(INTDIR)\DOMTreeErrorReporter.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\DOMPrint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -305,26 +224,31 @@ INTDIR=.\..\..\..\..\..\Build\Win64\VC6\Release\obj
 OutDir=.\..\..\..\..\..\Build\Win64\VC6\Release
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0" 
 
-ALL : "$(OUTDIR)\DOMPrint.exe"
+ALL : "$(OUTDIR)\DOMPrint.exe" "$(OUTDIR)\DOMPrint.bsc"
 
-!ELSE
+!ELSE 
 
-ALL : "XercesLib - Win64 Release" "$(OUTDIR)\DOMPrint.exe"
+ALL : "XercesLib - Win64 Release" "$(OUTDIR)\DOMPrint.exe" "$(OUTDIR)\DOMPrint.bsc"
 
-!ENDIF
+!ENDIF 
 
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win64 ReleaseCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1" 
+CLEAN :"XercesLib - Win64 ReleaseCLEAN" 
+!ELSE 
 CLEAN :
-!ENDIF
+!ENDIF 
 	-@erase "$(INTDIR)\DOMPrint.obj"
+	-@erase "$(INTDIR)\DOMPrint.sbr"
 	-@erase "$(INTDIR)\DOMPrintErrorHandler.obj"
+	-@erase "$(INTDIR)\DOMPrintErrorHandler.sbr"
 	-@erase "$(INTDIR)\DOMPrintFilter.obj"
+	-@erase "$(INTDIR)\DOMPrintFilter.sbr"
 	-@erase "$(INTDIR)\DOMTreeErrorReporter.obj"
+	-@erase "$(INTDIR)\DOMTreeErrorReporter.sbr"
 	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(OUTDIR)\DOMPrint.bsc"
 	-@erase "$(OUTDIR)\DOMPrint.exe"
 	-@erase "$(OUTDIR)\DOMPrint.ilk"
 
@@ -334,143 +258,256 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\DOMPrint.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\DOMPrint.sbr" \
+	"$(INTDIR)\DOMPrintErrorHandler.sbr" \
+	"$(INTDIR)\DOMPrintFilter.sbr" \
+	"$(INTDIR)\DOMTreeErrorReporter.sbr"
+
+"$(OUTDIR)\DOMPrint.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMPrint.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMPrint.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\DOMPrint.obj" \
+	"$(INTDIR)\DOMPrintErrorHandler.obj" \
+	"$(INTDIR)\DOMPrintFilter.obj" \
+	"$(INTDIR)\DOMTreeErrorReporter.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\DOMPrint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $<
+   $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $<
+   $(CPP_PROJ) $< 
 <<
 
 .cxx{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $<
+   $(CPP_PROJ) $< 
 <<
 
 .c{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $<
+   $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $<
+   $(CPP_PROJ) $< 
 <<
 
 .cxx{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMPrint.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMPrint.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMPrint.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-LINK32_OBJS= \
-	"$(INTDIR)\DOMPrint.obj" \
-	"$(INTDIR)\DOMPrintErrorHandler.obj" \
-	"$(INTDIR)\DOMPrintFilter.obj" \
-	"$(INTDIR)\DOMTreeErrorReporter.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\DOMPrint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
+   $(CPP_PROJ) $< 
 <<
 
-!ENDIF
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("DOMPrint.dep")
 !INCLUDE "DOMPrint.dep"
-!ELSE
+!ELSE 
 !MESSAGE Warning: cannot find "DOMPrint.dep"
-!ENDIF
-!ENDIF
+!ENDIF 
+!ENDIF 
 
 
 !IF "$(CFG)" == "DOMPrint - Win32 Release" || "$(CFG)" == "DOMPrint - Win32 Debug" || "$(CFG)" == "DOMPrint - Win64 Debug" || "$(CFG)" == "DOMPrint - Win64 Release"
 
 !IF  "$(CFG)" == "DOMPrint - Win32 Release"
 
-"XercesLib - Win32 Release" :
+"XercesLib - Win32 Release" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Release"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Release" 
    cd "..\DOMPrint"
 
-"XercesLib - Win32 ReleaseCLEAN" :
+"XercesLib - Win32 ReleaseCLEAN" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Release" RECURSE=1 CLEAN
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Release" RECURSE=1 CLEAN 
    cd "..\DOMPrint"
 
 !ELSEIF  "$(CFG)" == "DOMPrint - Win32 Debug"
 
-"XercesLib - Win32 Debug" :
+"XercesLib - Win32 Debug" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug" 
    cd "..\DOMPrint"
 
-"XercesLib - Win32 DebugCLEAN" :
+"XercesLib - Win32 DebugCLEAN" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug" RECURSE=1 CLEAN
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\DOMPrint"
 
 !ELSEIF  "$(CFG)" == "DOMPrint - Win64 Debug"
 
-"XercesLib - Win64 Debug" :
+"XercesLib - Win64 Debug" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug" 
    cd "..\DOMPrint"
 
-"XercesLib - Win64 DebugCLEAN" :
+"XercesLib - Win64 DebugCLEAN" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug" RECURSE=1 CLEAN
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug" RECURSE=1 CLEAN 
    cd "..\DOMPrint"
 
 !ELSEIF  "$(CFG)" == "DOMPrint - Win64 Release"
 
-"XercesLib - Win64 Release" :
+"XercesLib - Win64 Release" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Release"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Release" 
    cd "..\DOMPrint"
 
-"XercesLib - Win64 ReleaseCLEAN" :
+"XercesLib - Win64 ReleaseCLEAN" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Release" RECURSE=1 CLEAN
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Release" RECURSE=1 CLEAN 
    cd "..\DOMPrint"
 
-!ENDIF
+!ENDIF 
+
+SOURCE=..\..\..\..\..\samples\src\DOMPrint\DOMPrint.cpp
+
+!IF  "$(CFG)" == "DOMPrint - Win32 Release"
+
+
+"$(INTDIR)\DOMPrint.obj"	"$(INTDIR)\DOMPrint.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "DOMPrint - Win32 Debug"
 
-SOURCE=..\..\..\..\..\samples\DOMPrint\DOMPrint.cpp
 
 "$(INTDIR)\DOMPrint.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=..\..\..\..\..\samples\DOMPrint\DOMPrintErrorHandler.cpp
+!ELSEIF  "$(CFG)" == "DOMPrint - Win64 Debug"
+
+
+"$(INTDIR)\DOMPrint.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "DOMPrint - Win64 Release"
+
+
+"$(INTDIR)\DOMPrint.obj"	"$(INTDIR)\DOMPrint.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\..\..\..\..\samples\src\DOMPrint\DOMPrintErrorHandler.cpp
+
+!IF  "$(CFG)" == "DOMPrint - Win32 Release"
+
+
+"$(INTDIR)\DOMPrintErrorHandler.obj"	"$(INTDIR)\DOMPrintErrorHandler.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "DOMPrint - Win32 Debug"
+
 
 "$(INTDIR)\DOMPrintErrorHandler.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
-SOURCE=..\..\..\..\..\samples\DOMPrint\DOMPrintFilter.cpp
+
+!ELSEIF  "$(CFG)" == "DOMPrint - Win64 Debug"
+
+
+"$(INTDIR)\DOMPrintErrorHandler.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "DOMPrint - Win64 Release"
+
+
+"$(INTDIR)\DOMPrintErrorHandler.obj"	"$(INTDIR)\DOMPrintErrorHandler.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\..\..\..\..\samples\src\DOMPrint\DOMPrintFilter.cpp
+
+!IF  "$(CFG)" == "DOMPrint - Win32 Release"
+
+
+"$(INTDIR)\DOMPrintFilter.obj"	"$(INTDIR)\DOMPrintFilter.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "DOMPrint - Win32 Debug"
+
 
 "$(INTDIR)\DOMPrintFilter.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
-SOURCE=..\..\..\..\..\samples\DOMPrint\DOMTreeErrorReporter.cpp
+
+!ELSEIF  "$(CFG)" == "DOMPrint - Win64 Debug"
+
+
+"$(INTDIR)\DOMPrintFilter.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "DOMPrint - Win64 Release"
+
+
+"$(INTDIR)\DOMPrintFilter.obj"	"$(INTDIR)\DOMPrintFilter.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\..\..\..\..\samples\src\DOMPrint\DOMTreeErrorReporter.cpp
+
+!IF  "$(CFG)" == "DOMPrint - Win32 Release"
+
+
+"$(INTDIR)\DOMTreeErrorReporter.obj"	"$(INTDIR)\DOMTreeErrorReporter.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "DOMPrint - Win32 Debug"
+
+
+"$(INTDIR)\DOMTreeErrorReporter.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "DOMPrint - Win64 Debug"
+
 
 "$(INTDIR)\DOMTreeErrorReporter.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "DOMPrint - Win64 Release"
+
+
+"$(INTDIR)\DOMTreeErrorReporter.obj"	"$(INTDIR)\DOMTreeErrorReporter.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
 
diff --git a/Projects/Win32/VC6/xerces-all/DOMTest/DOMTest.mak b/Projects/Win32/VC6/xerces-all/DOMTest/DOMTest.mak
index 607abee8b..aba1d6712 100644
--- a/Projects/Win32/VC6/xerces-all/DOMTest/DOMTest.mak
+++ b/Projects/Win32/VC6/xerces-all/DOMTest/DOMTest.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "DOMTest - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -60,49 +63,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\DOMTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\DOMTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\DOMTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\DTest.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\DOMTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -145,49 +115,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\DOMTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\DTest.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\DOMTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -230,49 +167,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\DOMTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\DTest.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\DOMTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -313,8 +217,23 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\DOMTest.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\DTest.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\DOMTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -346,24 +265,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMTest.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\DTest.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\DOMTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("DOMTest.dep")
@@ -375,7 +276,7 @@ LINK32_OBJS= \
 
 
 !IF "$(CFG)" == "DOMTest - Win32 Release" || "$(CFG)" == "DOMTest - Win32 Debug" || "$(CFG)" == "DOMTest - Win64 Debug" || "$(CFG)" == "DOMTest - Win64 Release"
-SOURCE=..\..\..\..\..\tests\DOM\DOMTest\DTest.cpp
+SOURCE=..\..\..\..\..\tests\src\DOM\DOMTest\DTest.cpp
 
 "$(INTDIR)\DTest.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/DOMTraversalTest/DOMTraversalTest.mak b/Projects/Win32/VC6/xerces-all/DOMTraversalTest/DOMTraversalTest.mak
index ee57e3889..84c900411 100644
--- a/Projects/Win32/VC6/xerces-all/DOMTraversalTest/DOMTraversalTest.mak
+++ b/Projects/Win32/VC6/xerces-all/DOMTraversalTest/DOMTraversalTest.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "DOMTraversalTest - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -60,49 +63,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\DOMTraversalTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\DOMTraversalTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMTraversalTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\DOMTraversalTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMTraversalTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\Traversal.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\DOMTraversalTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -145,49 +115,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\DOMTraversalTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTraversalTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMTraversalTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTraversalTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMTraversalTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\Traversal.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\DOMTraversalTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -230,49 +167,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\DOMTraversalTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTraversalTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMTraversalTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTraversalTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMTraversalTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\Traversal.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\DOMTraversalTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -313,8 +217,23 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\DOMTraversalTest.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTraversalTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMTraversalTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\Traversal.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\DOMTraversalTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -346,24 +265,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMTraversalTest.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTraversalTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMTraversalTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\Traversal.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\DOMTraversalTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("DOMTraversalTest.dep")
@@ -375,7 +276,7 @@ LINK32_OBJS= \
 
 
 !IF "$(CFG)" == "DOMTraversalTest - Win32 Release" || "$(CFG)" == "DOMTraversalTest - Win32 Debug" || "$(CFG)" == "DOMTraversalTest - Win64 Debug" || "$(CFG)" == "DOMTraversalTest - Win64 Release"
-SOURCE=..\..\..\..\..\tests\DOM\Traversal\Traversal.cpp
+SOURCE=..\..\..\..\..\tests\src\DOM\Traversal\Traversal.cpp
 
 "$(INTDIR)\Traversal.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.mak b/Projects/Win32/VC6/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.mak
index 6e3d7be8c..cf08a0303 100644
--- a/Projects/Win32/VC6/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.mak
+++ b/Projects/Win32/VC6/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.mak
@@ -2,30 +2,33 @@
 !IF "$(CFG)" == ""
 CFG=DOMTypeInfoTest - Win32 Debug
 !MESSAGE No configuration specified. Defaulting to DOMTypeInfoTest - Win32 Debug.
-!ENDIF
+!ENDIF 
 
 !IF "$(CFG)" != "DOMTypeInfoTest - Win32 Release" && "$(CFG)" != "DOMTypeInfoTest - Win32 Debug" && "$(CFG)" != "DOMTypeInfoTest - Win64 Debug" && "$(CFG)" != "DOMTypeInfoTest - Win64 Release"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "DOMTypeInfoTest.mak" CFG="DOMTypeInfoTest - Win32 Debug"
-!MESSAGE
+!MESSAGE 
 !MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE 
 !MESSAGE "DOMTypeInfoTest - Win32 Release" (based on "Win32 (x86) Console Application")
 !MESSAGE "DOMTypeInfoTest - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE "DOMTypeInfoTest - Win64 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE "DOMTypeInfoTest - Win64 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE 
 !ERROR An invalid configuration is specified.
-!ENDIF
+!ENDIF 
 
 !IF "$(OS)" == "Windows_NT"
 NULL=
-!ELSE
+!ELSE 
 NULL=nul
-!ENDIF
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
 
 !IF  "$(CFG)" == "DOMTypeInfoTest - Win32 Release"
 
@@ -35,21 +38,21 @@ INTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release\obj
 OutDir=.\..\..\..\..\..\Build\Win32\VC6\Release
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0" 
 
 ALL : "$(OUTDIR)\DOMTypeInfoTest.exe"
 
-!ELSE
+!ELSE 
 
 ALL : "XercesLib - Win32 Release" "$(OUTDIR)\DOMTypeInfoTest.exe"
 
-!ENDIF
+!ENDIF 
 
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win32 ReleaseCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1" 
+CLEAN :"XercesLib - Win32 ReleaseCLEAN" 
+!ELSE 
 CLEAN :
-!ENDIF
+!ENDIF 
 	-@erase "$(INTDIR)\TypeInfo.obj"
 	-@erase "$(INTDIR)\vc60.idb"
 	-@erase "$(OUTDIR)\DOMTypeInfoTest.exe"
@@ -60,49 +63,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /Zm1000 /c 
 BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMTypeInfoTest.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\DOMTypeInfoTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\DOMTypeInfoTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMTypeInfoTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\DOMTypeInfoTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMTypeInfoTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\TypeInfo.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\DOMTypeInfoTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -117,21 +87,21 @@ INTDIR=.\..\..\..\..\..\Build\Win32\VC6\Debug\obj
 OutDir=.\..\..\..\..\..\Build\Win32\VC6\Debug
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0" 
 
 ALL : "$(OUTDIR)\DOMTypeInfoTest.exe"
 
-!ELSE
+!ELSE 
 
 ALL : "XercesLib - Win32 Debug" "$(OUTDIR)\DOMTypeInfoTest.exe"
 
-!ENDIF
+!ENDIF 
 
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win32 DebugCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1" 
+CLEAN :"XercesLib - Win32 DebugCLEAN" 
+!ELSE 
 CLEAN :
-!ENDIF
+!ENDIF 
 	-@erase "$(INTDIR)\TypeInfo.obj"
 	-@erase "$(INTDIR)\vc60.idb"
 	-@erase "$(INTDIR)\vc60.pdb"
@@ -145,49 +115,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /Zm1000 /c 
 BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMTypeInfoTest.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\DOMTypeInfoTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTypeInfoTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMTypeInfoTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTypeInfoTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMTypeInfoTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\TypeInfo.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\DOMTypeInfoTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -202,21 +139,21 @@ INTDIR=.\..\..\..\..\..\Build\Win64\VC6\Debug\obj
 OutDir=.\..\..\..\..\..\Build\Win64\VC6\Debug
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0" 
 
 ALL : "$(OUTDIR)\DOMTypeInfoTest.exe"
 
-!ELSE
+!ELSE 
 
 ALL : "XercesLib - Win64 Debug" "$(OUTDIR)\DOMTypeInfoTest.exe"
 
-!ENDIF
+!ENDIF 
 
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win64 DebugCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1" 
+CLEAN :"XercesLib - Win64 DebugCLEAN" 
+!ELSE 
 CLEAN :
-!ENDIF
+!ENDIF 
 	-@erase "$(INTDIR)\TypeInfo.obj"
 	-@erase "$(INTDIR)\vc60.idb"
 	-@erase "$(INTDIR)\vc60.pdb"
@@ -230,49 +167,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /Zm1000 /c 
 BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMTypeInfoTest.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\DOMTypeInfoTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTypeInfoTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMTypeInfoTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTypeInfoTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMTypeInfoTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\TypeInfo.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\DOMTypeInfoTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -287,21 +191,21 @@ INTDIR=.\..\..\..\..\..\Build\Win64\VC6\Release\obj
 OutDir=.\..\..\..\..\..\Build\Win64\VC6\Release
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0" 
 
 ALL : "$(OUTDIR)\DOMTypeInfoTest.exe"
 
-!ELSE
+!ELSE 
 
 ALL : "XercesLib - Win64 Release" "$(OUTDIR)\DOMTypeInfoTest.exe"
 
-!ENDIF
+!ENDIF 
 
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win64 ReleaseCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1" 
+CLEAN :"XercesLib - Win64 ReleaseCLEAN" 
+!ELSE 
 CLEAN :
-!ENDIF
+!ENDIF 
 	-@erase "$(INTDIR)\TypeInfo.obj"
 	-@erase "$(INTDIR)\vc60.idb"
 	-@erase "$(OUTDIR)\DOMTypeInfoTest.exe"
@@ -313,69 +217,66 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/MD /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /Zm1000 /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\DOMTypeInfoTest.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTypeInfoTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMTypeInfoTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\TypeInfo.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\DOMTypeInfoTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $<
+   $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $<
+   $(CPP_PROJ) $< 
 <<
 
 .cxx{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $<
+   $(CPP_PROJ) $< 
 <<
 
 .c{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $<
+   $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $<
+   $(CPP_PROJ) $< 
 <<
 
 .cxx{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMTypeInfoTest.bsc"
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTypeInfoTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMTypeInfoTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-LINK32_OBJS= \
-	"$(INTDIR)\TypeInfo.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\DOMTypeInfoTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
+   $(CPP_PROJ) $< 
 <<
 
-!ENDIF
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("DOMTypeInfoTest.dep")
 !INCLUDE "DOMTypeInfoTest.dep"
-!ELSE
+!ELSE 
 !MESSAGE Warning: cannot find "DOMTypeInfoTest.dep"
-!ENDIF
-!ENDIF
+!ENDIF 
+!ENDIF 
 
 
 !IF "$(CFG)" == "DOMTypeInfoTest - Win32 Release" || "$(CFG)" == "DOMTypeInfoTest - Win32 Debug" || "$(CFG)" == "DOMTypeInfoTest - Win64 Debug" || "$(CFG)" == "DOMTypeInfoTest - Win64 Release"
-SOURCE=..\..\..\..\..\tests\DOM\TypeInfo\TypeInfo.cpp
+SOURCE=..\..\..\..\..\tests\src\DOM\TypeInfo\TypeInfo.cpp
 
 "$(INTDIR)\TypeInfo.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -383,54 +284,54 @@ SOURCE=..\..\..\..\..\tests\DOM\TypeInfo\TypeInfo.cpp
 
 !IF  "$(CFG)" == "DOMTypeInfoTest - Win32 Release"
 
-"XercesLib - Win32 Release" :
+"XercesLib - Win32 Release" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Release"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Release" 
    cd "..\DOMTypeInfoTest"
 
-"XercesLib - Win32 ReleaseCLEAN" :
+"XercesLib - Win32 ReleaseCLEAN" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Release" RECURSE=1 CLEAN
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Release" RECURSE=1 CLEAN 
    cd "..\DOMTypeInfoTest"
 
 !ELSEIF  "$(CFG)" == "DOMTypeInfoTest - Win32 Debug"
 
-"XercesLib - Win32 Debug" :
+"XercesLib - Win32 Debug" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug" 
    cd "..\DOMTypeInfoTest"
 
-"XercesLib - Win32 DebugCLEAN" :
+"XercesLib - Win32 DebugCLEAN" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug" RECURSE=1 CLEAN
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\DOMTypeInfoTest"
 
 !ELSEIF  "$(CFG)" == "DOMTypeInfoTest - Win64 Debug"
 
-"XercesLib - Win64 Debug" :
+"XercesLib - Win64 Debug" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug" 
    cd "..\DOMTypeInfoTest"
 
-"XercesLib - Win64 DebugCLEAN" :
+"XercesLib - Win64 DebugCLEAN" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug" RECURSE=1 CLEAN
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug" RECURSE=1 CLEAN 
    cd "..\DOMTypeInfoTest"
 
 !ELSEIF  "$(CFG)" == "DOMTypeInfoTest - Win64 Release"
 
-"XercesLib - Win64 Release" :
+"XercesLib - Win64 Release" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Release"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Release" 
    cd "..\DOMTypeInfoTest"
 
-"XercesLib - Win64 ReleaseCLEAN" :
+"XercesLib - Win64 ReleaseCLEAN" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Release" RECURSE=1 CLEAN
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Release" RECURSE=1 CLEAN 
    cd "..\DOMTypeInfoTest"
 
-!ENDIF
+!ENDIF 
 
 
-!ENDIF
+!ENDIF 
 
diff --git a/Projects/Win32/VC6/xerces-all/EncodingTest/EncodingTest.mak b/Projects/Win32/VC6/xerces-all/EncodingTest/EncodingTest.mak
index b7b5b6a09..a1c1c9a15 100644
--- a/Projects/Win32/VC6/xerces-all/EncodingTest/EncodingTest.mak
+++ b/Projects/Win32/VC6/xerces-all/EncodingTest/EncodingTest.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "EncodingTest - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -60,49 +63,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\EncodingTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\EncodingTest.pdb" /machine:I386 /out:"$(OUTDIR)\EncodingTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\EncodingTest.pdb" /machine:I386 /out:"$(OUTDIR)\EncodingTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\EncodingTest.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\EncodingTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -145,49 +115,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\EncodingTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\EncodingTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\EncodingTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\EncodingTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\EncodingTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\EncodingTest.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\EncodingTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -230,49 +167,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\EncodingTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\EncodingTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\EncodingTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\EncodingTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\EncodingTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\EncodingTest.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\EncodingTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -313,8 +217,23 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\EncodingTest.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\EncodingTest.pdb" /machine:IX86 /out:"$(OUTDIR)\EncodingTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\EncodingTest.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\EncodingTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -346,24 +265,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\EncodingTest.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\EncodingTest.pdb" /machine:IX86 /out:"$(OUTDIR)\EncodingTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\EncodingTest.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\EncodingTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("EncodingTest.dep")
@@ -375,7 +276,7 @@ LINK32_OBJS= \
 
 
 !IF "$(CFG)" == "EncodingTest - Win32 Release" || "$(CFG)" == "EncodingTest - Win32 Debug" || "$(CFG)" == "EncodingTest - Win64 Debug" || "$(CFG)" == "EncodingTest - Win64 Release"
-SOURCE=..\..\..\..\..\tests\EncodingTest\EncodingTest.cpp
+SOURCE=..\..\..\..\..\tests\src\EncodingTest\EncodingTest.cpp
 
 "$(INTDIR)\EncodingTest.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/EnumVal/EnumVal.mak b/Projects/Win32/VC6/xerces-all/EnumVal/EnumVal.mak
index 488396532..eeb8466db 100644
--- a/Projects/Win32/VC6/xerces-all/EnumVal/EnumVal.mak
+++ b/Projects/Win32/VC6/xerces-all/EnumVal/EnumVal.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "EnumVal - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -61,49 +64,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\EnumVal.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\EnumVal.pdb" /machine:I386 /out:"$(OUTDIR)\EnumVal.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\EnumVal.pdb" /machine:I386 /out:"$(OUTDIR)\EnumVal.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\EnumVal.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\EnumVal.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -146,49 +116,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\EnumVal.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\EnumVal.pdb" /debug /machine:I386 /out:"$(OUTDIR)\EnumVal.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\EnumVal.pdb" /debug /machine:I386 /out:"$(OUTDIR)\EnumVal.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\EnumVal.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\EnumVal.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -231,49 +168,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\EnumVal.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\EnumVal.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\EnumVal.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\EnumVal.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\EnumVal.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\EnumVal.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\EnumVal.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -314,8 +218,23 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\EnumVal.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\EnumVal.pdb" /machine:IX86 /out:"$(OUTDIR)\EnumVal.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\EnumVal.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\EnumVal.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -347,24 +266,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\EnumVal.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\EnumVal.pdb" /machine:IX86 /out:"$(OUTDIR)\EnumVal.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\EnumVal.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\EnumVal.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("EnumVal.dep")
@@ -427,7 +328,7 @@ LINK32_OBJS= \
 
 !ENDIF 
 
-SOURCE=..\..\..\..\..\samples\EnumVal\EnumVal.cpp
+SOURCE=..\..\..\..\..\samples\src\EnumVal\EnumVal.cpp
 
 "$(INTDIR)\EnumVal.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/InitTermTest/InitTermTest.mak b/Projects/Win32/VC6/xerces-all/InitTermTest/InitTermTest.mak
index d9a4f8de7..67878afe3 100644
--- a/Projects/Win32/VC6/xerces-all/InitTermTest/InitTermTest.mak
+++ b/Projects/Win32/VC6/xerces-all/InitTermTest/InitTermTest.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "InitTermTest - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -60,49 +63,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\InitTermTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\InitTermTest.pdb" /machine:I386 /out:"$(OUTDIR)\InitTermTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\InitTermTest.pdb" /machine:I386 /out:"$(OUTDIR)\InitTermTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\InitTermTest.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\InitTermTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -145,49 +115,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\InitTermTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\InitTermTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\InitTermTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\InitTermTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\InitTermTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\InitTermTest.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\InitTermTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -230,49 +167,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\InitTermTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\InitTermTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\InitTermTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\InitTermTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\InitTermTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\InitTermTest.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\InitTermTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -313,8 +217,23 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\InitTermTest.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\InitTermTest.pdb" /machine:IX86 /out:"$(OUTDIR)\InitTermTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\InitTermTest.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\InitTermTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -346,24 +265,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\InitTermTest.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\InitTermTest.pdb" /machine:IX86 /out:"$(OUTDIR)\InitTermTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\InitTermTest.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\InitTermTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("InitTermTest.dep")
@@ -375,7 +276,7 @@ LINK32_OBJS= \
 
 
 !IF "$(CFG)" == "InitTermTest - Win32 Release" || "$(CFG)" == "InitTermTest - Win32 Debug" || "$(CFG)" == "InitTermTest - Win64 Debug" || "$(CFG)" == "InitTermTest - Win64 Release"
-SOURCE=..\..\..\..\..\tests\InitTermTest\InitTermTest.cpp
+SOURCE=..\..\..\..\..\tests\src\InitTermTest\InitTermTest.cpp
 
 "$(INTDIR)\InitTermTest.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/MemHandlerTest/MemHandlerTest.mak b/Projects/Win32/VC6/xerces-all/MemHandlerTest/MemHandlerTest.mak
index 52635481f..3223c8005 100755
--- a/Projects/Win32/VC6/xerces-all/MemHandlerTest/MemHandlerTest.mak
+++ b/Projects/Win32/VC6/xerces-all/MemHandlerTest/MemHandlerTest.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "MemHandlerTest - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -41,12 +44,12 @@ ALL : "$(OUTDIR)\MemHandlerTest.exe"
 
 !ELSE 
 
-ALL : "XercesDeprecatedDOMLib - Win32 Release" "XercesLib - Win32 Release" "$(OUTDIR)\MemHandlerTest.exe"
+ALL : "XercesLib - Win32 Release" "$(OUTDIR)\MemHandlerTest.exe"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"XercesLib - Win32 ReleaseCLEAN" "XercesDeprecatedDOMLib - Win32 ReleaseCLEAN" 
+CLEAN :"XercesLib - Win32 ReleaseCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -61,51 +64,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\MemHandlerTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib xerces-depdom_2.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\MemHandlerTest.pdb" /machine:I386 /out:"$(OUTDIR)\MemHandlerTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\MemHandlerTest.pdb" /machine:I386 /out:"$(OUTDIR)\MemHandlerTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\MemoryMonitor.obj" \
 	"$(INTDIR)\SimpleHashPtr.obj" \
-	"$(OUTDIR)\xerces-c_2.lib" \
-	"$(OUTDIR)\xerces-depdom_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\MemHandlerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -126,12 +95,12 @@ ALL : "$(OUTDIR)\MemHandlerTest.exe"
 
 !ELSE 
 
-ALL : "XercesDeprecatedDOMLib - Win32 Debug" "XercesLib - Win32 Debug" "$(OUTDIR)\MemHandlerTest.exe"
+ALL : "XercesLib - Win32 Debug" "$(OUTDIR)\MemHandlerTest.exe"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"XercesLib - Win32 DebugCLEAN" "XercesDeprecatedDOMLib - Win32 DebugCLEAN" 
+CLEAN :"XercesLib - Win32 DebugCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -149,51 +118,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\MemHandlerTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib xerces-depdom_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\MemHandlerTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\MemHandlerTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\MemHandlerTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\MemHandlerTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\MemoryMonitor.obj" \
 	"$(INTDIR)\SimpleHashPtr.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib" \
-	"$(OUTDIR)\xerces-depdom_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\MemHandlerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -214,12 +149,12 @@ ALL : "$(OUTDIR)\MemHandlerTest.exe"
 
 !ELSE 
 
-ALL : "XercesDeprecatedDOMLib - Win64 Debug" "XercesLib - Win64 Debug" "$(OUTDIR)\MemHandlerTest.exe"
+ALL : "XercesLib - Win64 Debug" "$(OUTDIR)\MemHandlerTest.exe"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"XercesLib - Win64 DebugCLEAN" "XercesDeprecatedDOMLib - Win64 DebugCLEAN" 
+CLEAN :"XercesLib - Win64 DebugCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -237,51 +172,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\MemHandlerTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib xerces-depdom_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\MemHandlerTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\MemHandlerTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\MemHandlerTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\MemHandlerTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\MemoryMonitor.obj" \
 	"$(INTDIR)\SimpleHashPtr.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib" \
-	"$(OUTDIR)\xerces-depdom_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\MemHandlerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -302,12 +203,12 @@ ALL : "$(OUTDIR)\MemHandlerTest.exe"
 
 !ELSE 
 
-ALL : "XercesDeprecatedDOMLib - Win64 Release" "XercesLib - Win64 Release" "$(OUTDIR)\MemHandlerTest.exe"
+ALL : "XercesLib - Win64 Release" "$(OUTDIR)\MemHandlerTest.exe"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"XercesLib - Win64 ReleaseCLEAN" "XercesDeprecatedDOMLib - Win64 ReleaseCLEAN" 
+CLEAN :"XercesLib - Win64 ReleaseCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -323,8 +224,24 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\MemHandlerTest.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\MemHandlerTest.pdb" /machine:IX86 /out:"$(OUTDIR)\MemHandlerTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\MemoryMonitor.obj" \
+	"$(INTDIR)\SimpleHashPtr.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\MemHandlerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -356,26 +273,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\MemHandlerTest.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib xerces-depdom_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\MemHandlerTest.pdb" /machine:IX86 /out:"$(OUTDIR)\MemHandlerTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\MemoryMonitor.obj" \
-	"$(INTDIR)\SimpleHashPtr.obj" \
-	"$(OUTDIR)\xerces-c_2.lib" \
-	"$(OUTDIR)\xerces-depdom_2.lib"
-
-"$(OUTDIR)\MemHandlerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("MemHandlerTest.dep")
@@ -387,13 +284,13 @@ LINK32_OBJS= \
 
 
 !IF "$(CFG)" == "MemHandlerTest - Win32 Release" || "$(CFG)" == "MemHandlerTest - Win32 Debug" || "$(CFG)" == "MemHandlerTest - Win64 Debug" || "$(CFG)" == "MemHandlerTest - Win64 Release"
-SOURCE=..\..\..\..\..\tests\MemHandlerTest\MemoryMonitor.cpp
+SOURCE=..\..\..\..\..\tests\src\MemHandlerTest\MemoryMonitor.cpp
 
 "$(INTDIR)\MemoryMonitor.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=..\..\..\..\..\tests\MemHandlerTest\SimpleHashPtr.cpp
+SOURCE=..\..\..\..\..\tests\src\MemHandlerTest\SimpleHashPtr.cpp
 
 "$(INTDIR)\SimpleHashPtr.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -449,56 +346,6 @@ SOURCE=..\..\..\..\..\tests\MemHandlerTest\SimpleHashPtr.cpp
 
 !ENDIF 
 
-!IF  "$(CFG)" == "MemHandlerTest - Win32 Release"
-
-"XercesDeprecatedDOMLib - Win32 Release" : 
-   cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win32 Release" 
-   cd "..\MemHandlerTest"
-
-"XercesDeprecatedDOMLib - Win32 ReleaseCLEAN" : 
-   cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\MemHandlerTest"
-
-!ELSEIF  "$(CFG)" == "MemHandlerTest - Win32 Debug"
-
-"XercesDeprecatedDOMLib - Win32 Debug" : 
-   cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win32 Debug" 
-   cd "..\MemHandlerTest"
-
-"XercesDeprecatedDOMLib - Win32 DebugCLEAN" : 
-   cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\MemHandlerTest"
-
-!ELSEIF  "$(CFG)" == "MemHandlerTest - Win64 Debug"
-
-"XercesDeprecatedDOMLib - Win64 Debug" : 
-   cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win64 Debug" 
-   cd "..\MemHandlerTest"
-
-"XercesDeprecatedDOMLib - Win64 DebugCLEAN" : 
-   cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win64 Debug" RECURSE=1 CLEAN 
-   cd "..\MemHandlerTest"
-
-!ELSEIF  "$(CFG)" == "MemHandlerTest - Win64 Release"
-
-"XercesDeprecatedDOMLib - Win64 Release" : 
-   cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win64 Release" 
-   cd "..\MemHandlerTest"
-
-"XercesDeprecatedDOMLib - Win64 ReleaseCLEAN" : 
-   cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win64 Release" RECURSE=1 CLEAN 
-   cd "..\MemHandlerTest"
-
-!ENDIF 
-
 
 !ENDIF 
 
diff --git a/Projects/Win32/VC6/xerces-all/MemParse/MemParse.mak b/Projects/Win32/VC6/xerces-all/MemParse/MemParse.mak
index 857cb4e94..a57571ebe 100644
--- a/Projects/Win32/VC6/xerces-all/MemParse/MemParse.mak
+++ b/Projects/Win32/VC6/xerces-all/MemParse/MemParse.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "MemParse - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -62,50 +65,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\MemParse.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\MemParse.pdb" /machine:I386 /out:"$(OUTDIR)\MemParse.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\MemParse.pdb" /machine:I386 /out:"$(OUTDIR)\MemParse.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\MemParse.obj" \
 	"$(INTDIR)\MemParseHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\MemParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -149,50 +119,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\MemParse.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\MemParse.pdb" /debug /machine:I386 /out:"$(OUTDIR)\MemParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\MemParse.pdb" /debug /machine:I386 /out:"$(OUTDIR)\MemParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\MemParse.obj" \
 	"$(INTDIR)\MemParseHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\MemParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -236,50 +173,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\MemParse.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\MemParse.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\MemParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\MemParse.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\MemParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\MemParse.obj" \
 	"$(INTDIR)\MemParseHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\MemParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -321,8 +225,24 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\MemParse.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\MemParse.pdb" /machine:IX86 /out:"$(OUTDIR)\MemParse.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\MemParse.obj" \
+	"$(INTDIR)\MemParseHandlers.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\MemParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -354,25 +274,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\MemParse.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\MemParse.pdb" /machine:IX86 /out:"$(OUTDIR)\MemParse.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\MemParse.obj" \
-	"$(INTDIR)\MemParseHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\MemParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("MemParse.dep")
@@ -435,13 +336,13 @@ LINK32_OBJS= \
 
 !ENDIF 
 
-SOURCE=..\..\..\..\..\samples\MemParse\MemParse.cpp
+SOURCE=..\..\..\..\..\samples\src\MemParse\MemParse.cpp
 
 "$(INTDIR)\MemParse.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=..\..\..\..\..\samples\MemParse\MemParseHandlers.cpp
+SOURCE=..\..\..\..\..\samples\src\MemParse\MemParseHandlers.cpp
 
 "$(INTDIR)\MemParseHandlers.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/PParse/PParse.mak b/Projects/Win32/VC6/xerces-all/PParse/PParse.mak
index c84c3f07a..0ec46cf43 100644
--- a/Projects/Win32/VC6/xerces-all/PParse/PParse.mak
+++ b/Projects/Win32/VC6/xerces-all/PParse/PParse.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "PParse - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -62,50 +65,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\PParse.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PParse.pdb" /machine:I386 /out:"$(OUTDIR)\PParse.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PParse.pdb" /machine:I386 /out:"$(OUTDIR)\PParse.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\PParse.obj" \
 	"$(INTDIR)\PParseHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\PParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -149,50 +119,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\PParse.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PParse.pdb" /debug /machine:I386 /out:"$(OUTDIR)\PParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PParse.pdb" /debug /machine:I386 /out:"$(OUTDIR)\PParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\PParse.obj" \
 	"$(INTDIR)\PParseHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\PParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -236,50 +173,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\PParse.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PParse.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\PParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PParse.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\PParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\PParse.obj" \
 	"$(INTDIR)\PParseHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\PParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -321,8 +225,24 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\PParse.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PParse.pdb" /machine:IX86 /out:"$(OUTDIR)\PParse.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\PParse.obj" \
+	"$(INTDIR)\PParseHandlers.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\PParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -354,25 +274,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\PParse.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PParse.pdb" /machine:IX86 /out:"$(OUTDIR)\PParse.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\PParse.obj" \
-	"$(INTDIR)\PParseHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\PParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("PParse.dep")
@@ -384,13 +285,13 @@ LINK32_OBJS= \
 
 
 !IF "$(CFG)" == "PParse - Win32 Release" || "$(CFG)" == "PParse - Win32 Debug" || "$(CFG)" == "PParse - Win64 Debug" || "$(CFG)" == "PParse - Win64 Release"
-SOURCE=..\..\..\..\..\samples\PParse\PParse.cpp
+SOURCE=..\..\..\..\..\samples\src\PParse\PParse.cpp
 
 "$(INTDIR)\PParse.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=..\..\..\..\..\samples\PParse\PParseHandlers.cpp
+SOURCE=..\..\..\..\..\samples\src\PParse\PParseHandlers.cpp
 
 "$(INTDIR)\PParseHandlers.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/PSVIWriter/PSVIWriter.mak b/Projects/Win32/VC6/xerces-all/PSVIWriter/PSVIWriter.mak
index 54b704aff..21c0c879e 100644
--- a/Projects/Win32/VC6/xerces-all/PSVIWriter/PSVIWriter.mak
+++ b/Projects/Win32/VC6/xerces-all/PSVIWriter/PSVIWriter.mak
@@ -27,7 +27,8 @@ NULL=
 NULL=nul
 !ENDIF 
 
-CPP=$(CPP)
+CPP=cl.exe
+RSC=rc.exe
 
 !IF  "$(CFG)" == "PSVIWriter - Win32 Release"
 
@@ -52,7 +53,6 @@ CLEAN :"XercesLib - Win32 ReleaseCLEAN"
 !ELSE 
 CLEAN :
 !ENDIF 
-	-@erase "$(INTDIR)\PSVIUni.obj"
 	-@erase "$(INTDIR)\PSVIWriter.obj"
 	-@erase "$(INTDIR)\PSVIWriterHandlers.obj"
 	-@erase "$(INTDIR)\vc60.idb"
@@ -65,18 +65,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\PSVIWriter.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PSVIWriter.pdb" /machine:I386 /out:"$(OUTDIR)\PSVIWriter.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PSVIWriter.pdb" /machine:I386 /out:"$(OUTDIR)\PSVIWriter.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
-	"$(INTDIR)\PSVIUni.obj" \
 	"$(INTDIR)\PSVIWriter.obj" \
 	"$(INTDIR)\PSVIWriterHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\PSVIWriter.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -106,7 +105,6 @@ CLEAN :"XercesLib - Win32 DebugCLEAN"
 !ELSE 
 CLEAN :
 !ENDIF 
-	-@erase "$(INTDIR)\PSVIUni.obj"
 	-@erase "$(INTDIR)\PSVIWriter.obj"
 	-@erase "$(INTDIR)\PSVIWriterHandlers.obj"
 	-@erase "$(INTDIR)\vc60.idb"
@@ -121,18 +119,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_CONSOLE" /D "PLATFORM_WIN32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\PSVIWriter.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PSVIWriter.pdb" /debug /machine:I386 /out:"$(OUTDIR)\PSVIWriter.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PSVIWriter.pdb" /debug /machine:I386 /out:"$(OUTDIR)\PSVIWriter.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
-	"$(INTDIR)\PSVIUni.obj" \
 	"$(INTDIR)\PSVIWriter.obj" \
 	"$(INTDIR)\PSVIWriterHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\PSVIWriter.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -162,7 +159,6 @@ CLEAN :"XercesLib - Win64 DebugCLEAN"
 !ELSE 
 CLEAN :
 !ENDIF 
-	-@erase "$(INTDIR)\PSVIUni.obj"
 	-@erase "$(INTDIR)\PSVIWriter.obj"
 	-@erase "$(INTDIR)\PSVIWriterHandlers.obj"
 	-@erase "$(INTDIR)\vc60.idb"
@@ -177,18 +173,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\PSVIWriter.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PSVIWriter.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\PSVIWriter.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PSVIWriter.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\PSVIWriter.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
-	"$(INTDIR)\PSVIUni.obj" \
 	"$(INTDIR)\PSVIWriter.obj" \
 	"$(INTDIR)\PSVIWriterHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\PSVIWriter.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -205,11 +200,11 @@ OutDir=.\..\..\..\..\..\Build\Win64\VC6\Release
 
 !IF "$(RECURSE)" == "0" 
 
-ALL : "$(OUTDIR)\PSVIWriter.exe"
+ALL : "$(OUTDIR)\PSVIWriter.exe" "$(OUTDIR)\PSVIWriter.bsc"
 
 !ELSE 
 
-ALL : "XercesLib - Win64 Release" "$(OUTDIR)\PSVIWriter.exe"
+ALL : "XercesLib - Win64 Release" "$(OUTDIR)\PSVIWriter.exe" "$(OUTDIR)\PSVIWriter.bsc"
 
 !ENDIF 
 
@@ -218,10 +213,12 @@ CLEAN :"XercesLib - Win64 ReleaseCLEAN"
 !ELSE 
 CLEAN :
 !ENDIF 
-	-@erase "$(INTDIR)\PSVIUni.obj"
 	-@erase "$(INTDIR)\PSVIWriter.obj"
+	-@erase "$(INTDIR)\PSVIWriter.sbr"
 	-@erase "$(INTDIR)\PSVIWriterHandlers.obj"
+	-@erase "$(INTDIR)\PSVIWriterHandlers.sbr"
 	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(OUTDIR)\PSVIWriter.bsc"
 	-@erase "$(OUTDIR)\PSVIWriter.exe"
 	-@erase "$(OUTDIR)\PSVIWriter.ilk"
 
@@ -231,18 +228,24 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\PSVIWriter.bsc" 
 BSC32_SBRS= \
-	
+	"$(INTDIR)\PSVIWriter.sbr" \
+	"$(INTDIR)\PSVIWriterHandlers.sbr"
+
+"$(OUTDIR)\PSVIWriter.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PSVIWriter.pdb" /machine:IX86 /out:"$(OUTDIR)\PSVIWriter.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PSVIWriter.pdb" /machine:IX86 /out:"$(OUTDIR)\PSVIWriter.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
 LINK32_OBJS= \
-	"$(INTDIR)\PSVIUni.obj" \
 	"$(INTDIR)\PSVIWriter.obj" \
 	"$(INTDIR)\PSVIWriterHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\PSVIWriter.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -343,24 +346,70 @@ LINK32_OBJS= \
 
 !ENDIF 
 
-SOURCE=..\..\..\..\..\samples\PSVIWriter\PSVIUni.cpp
+SOURCE=..\..\..\..\..\samples\src\PSVIWriter\PSVIWriter.cpp
+
+!IF  "$(CFG)" == "PSVIWriter - Win32 Release"
+
+
+"$(INTDIR)\PSVIWriter.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "PSVIWriter - Win32 Debug"
+
 
-"$(INTDIR)\PSVIUni.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\PSVIWriter.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=..\..\..\..\..\samples\PSVIWriter\PSVIWriter.cpp
+!ELSEIF  "$(CFG)" == "PSVIWriter - Win64 Debug"
+
 
 "$(INTDIR)\PSVIWriter.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=..\..\..\..\..\samples\PSVIWriter\PSVIWriterHandlers.cpp
+!ELSEIF  "$(CFG)" == "PSVIWriter - Win64 Release"
+
+
+"$(INTDIR)\PSVIWriter.obj"	"$(INTDIR)\PSVIWriter.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\..\..\..\..\samples\src\PSVIWriter\PSVIWriterHandlers.cpp
+
+!IF  "$(CFG)" == "PSVIWriter - Win32 Release"
+
 
 "$(INTDIR)\PSVIWriterHandlers.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ELSEIF  "$(CFG)" == "PSVIWriter - Win32 Debug"
+
+
+"$(INTDIR)\PSVIWriterHandlers.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "PSVIWriter - Win64 Debug"
+
+
+"$(INTDIR)\PSVIWriterHandlers.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "PSVIWriter - Win64 Release"
+
+
+"$(INTDIR)\PSVIWriterHandlers.obj"	"$(INTDIR)\PSVIWriterHandlers.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
 
 !ENDIF 
 
diff --git a/Projects/Win32/VC6/xerces-all/RangeTest/RangeTest.mak b/Projects/Win32/VC6/xerces-all/RangeTest/RangeTest.mak
index 79c6bbcc4..4784e7b9d 100644
--- a/Projects/Win32/VC6/xerces-all/RangeTest/RangeTest.mak
+++ b/Projects/Win32/VC6/xerces-all/RangeTest/RangeTest.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "RangeTest - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -61,49 +64,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\RangeTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\RangeTest.pdb" /machine:I386 /out:"$(OUTDIR)\RangeTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\RangeTest.pdb" /machine:I386 /out:"$(OUTDIR)\RangeTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\RangeTest.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\RangeTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -146,49 +116,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\RangeTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\RangeTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\RangeTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\RangeTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\RangeTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\RangeTest.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\RangeTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -231,49 +168,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\RangeTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\RangeTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\RangeTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\RangeTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\RangeTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\RangeTest.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\RangeTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -314,8 +218,23 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\RangeTest.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\RangeTest.pdb" /machine:IX86 /out:"$(OUTDIR)\RangeTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\RangeTest.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\RangeTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -347,24 +266,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "_CONSOLE" /
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\RangeTest.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\RangeTest.pdb" /machine:IX86 /out:"$(OUTDIR)\RangeTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\RangeTest.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\RangeTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("RangeTest.dep")
@@ -427,7 +328,7 @@ LINK32_OBJS= \
 
 !ENDIF 
 
-SOURCE=..\..\..\..\..\tests\Dom\RangeTest\RangeTest.cpp
+SOURCE=..\..\..\..\..\tests\src\DOM\RangeTest\RangeTest.cpp
 
 "$(INTDIR)\RangeTest.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/Redirect/Redirect.mak b/Projects/Win32/VC6/xerces-all/Redirect/Redirect.mak
index 832b73192..92a107120 100644
--- a/Projects/Win32/VC6/xerces-all/Redirect/Redirect.mak
+++ b/Projects/Win32/VC6/xerces-all/Redirect/Redirect.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "Redirect - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -62,50 +65,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\Redirect.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\Redirect.pdb" /machine:I386 /out:"$(OUTDIR)\Redirect.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\Redirect.pdb" /machine:I386 /out:"$(OUTDIR)\Redirect.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\Redirect.obj" \
 	"$(INTDIR)\RedirectHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\Redirect.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -149,50 +119,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\Redirect.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\Redirect.pdb" /debug /machine:I386 /out:"$(OUTDIR)\Redirect.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\Redirect.pdb" /debug /machine:I386 /out:"$(OUTDIR)\Redirect.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\Redirect.obj" \
 	"$(INTDIR)\RedirectHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\Redirect.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -236,50 +173,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\Redirect.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\Redirect.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\Redirect.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\Redirect.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\Redirect.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\Redirect.obj" \
 	"$(INTDIR)\RedirectHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\Redirect.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -321,8 +225,24 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\Redirect.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\Redirect.pdb" /machine:IX86 /out:"$(OUTDIR)\Redirect.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\Redirect.obj" \
+	"$(INTDIR)\RedirectHandlers.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\Redirect.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -354,25 +274,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CON
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\Redirect.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\Redirect.pdb" /machine:IX86 /out:"$(OUTDIR)\Redirect.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\Redirect.obj" \
-	"$(INTDIR)\RedirectHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\Redirect.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("Redirect.dep")
@@ -435,13 +336,13 @@ LINK32_OBJS= \
 
 !ENDIF 
 
-SOURCE=..\..\..\..\..\samples\Redirect\Redirect.cpp
+SOURCE=..\..\..\..\..\samples\src\Redirect\Redirect.cpp
 
 "$(INTDIR)\Redirect.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=..\..\..\..\..\samples\Redirect\RedirectHandlers.cpp
+SOURCE=..\..\..\..\..\samples\src\Redirect\RedirectHandlers.cpp
 
 "$(INTDIR)\RedirectHandlers.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/SAX2Count/SAX2Count.mak b/Projects/Win32/VC6/xerces-all/SAX2Count/SAX2Count.mak
index c2f48116e..d4288975b 100644
--- a/Projects/Win32/VC6/xerces-all/SAX2Count/SAX2Count.mak
+++ b/Projects/Win32/VC6/xerces-all/SAX2Count/SAX2Count.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "SAX2Count - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -62,50 +65,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\SAX2Count.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAX2Count.pdb" /machine:I386 /out:"$(OUTDIR)\SAX2Count.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAX2Count.pdb" /machine:I386 /out:"$(OUTDIR)\SAX2Count.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\SAX2Count.obj" \
 	"$(INTDIR)\SAX2CountHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\SAX2Count.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -149,50 +119,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\SAX2Count.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAX2Count.pdb" /debug /machine:I386 /out:"$(OUTDIR)\SAX2Count.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAX2Count.pdb" /debug /machine:I386 /out:"$(OUTDIR)\SAX2Count.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\SAX2Count.obj" \
 	"$(INTDIR)\SAX2CountHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\SAX2Count.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -236,50 +173,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\SAX2Count.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAX2Count.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\SAX2Count.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAX2Count.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\SAX2Count.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\SAX2Count.obj" \
 	"$(INTDIR)\SAX2CountHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\SAX2Count.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -321,8 +225,24 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\SAX2Count.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAX2Count.pdb" /machine:IX86 /out:"$(OUTDIR)\SAX2Count.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\SAX2Count.obj" \
+	"$(INTDIR)\SAX2CountHandlers.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\SAX2Count.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -354,25 +274,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\SAX2Count.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAX2Count.pdb" /machine:IX86 /out:"$(OUTDIR)\SAX2Count.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\SAX2Count.obj" \
-	"$(INTDIR)\SAX2CountHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\SAX2Count.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("SAX2Count.dep")
@@ -435,13 +336,13 @@ LINK32_OBJS= \
 
 !ENDIF 
 
-SOURCE=..\..\..\..\..\samples\SAX2Count\SAX2Count.cpp
+SOURCE=..\..\..\..\..\samples\src\SAX2Count\SAX2Count.cpp
 
 "$(INTDIR)\SAX2Count.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=..\..\..\..\..\samples\SAX2Count\SAX2CountHandlers.cpp
+SOURCE=..\..\..\..\..\samples\src\SAX2Count\SAX2CountHandlers.cpp
 
 "$(INTDIR)\SAX2CountHandlers.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/SAX2Print/SAX2Print.mak b/Projects/Win32/VC6/xerces-all/SAX2Print/SAX2Print.mak
index dca860f05..f4c0d0203 100644
--- a/Projects/Win32/VC6/xerces-all/SAX2Print/SAX2Print.mak
+++ b/Projects/Win32/VC6/xerces-all/SAX2Print/SAX2Print.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "SAX2Print - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -50,9 +53,9 @@ CLEAN :"XercesLib - Win32 ReleaseCLEAN"
 !ELSE 
 CLEAN :
 !ENDIF 
+	-@erase "$(INTDIR)\SAX2FilterHandlers.obj"
 	-@erase "$(INTDIR)\SAX2Print.obj"
 	-@erase "$(INTDIR)\SAX2PrintHandlers.obj"
-	-@erase "$(INTDIR)\SAX2FilterHandlers.obj"
 	-@erase "$(INTDIR)\vc60.idb"
 	-@erase "$(OUTDIR)\SAX2Print.exe"
 	-@erase "$(OUTDIR)\SAX2Print.ilk"
@@ -63,51 +66,18 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\SAX2Print.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAX2Print.pdb" /machine:I386 /out:"$(OUTDIR)\SAX2Print.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAX2Print.pdb" /machine:I386 /out:"$(OUTDIR)\SAX2Print.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
+	"$(INTDIR)\SAX2FilterHandlers.obj" \
 	"$(INTDIR)\SAX2Print.obj" \
 	"$(INTDIR)\SAX2PrintHandlers.obj" \
-	"$(INTDIR)\SAX2FilterHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\SAX2Print.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -137,9 +107,9 @@ CLEAN :"XercesLib - Win32 DebugCLEAN"
 !ELSE 
 CLEAN :
 !ENDIF 
+	-@erase "$(INTDIR)\SAX2FilterHandlers.obj"
 	-@erase "$(INTDIR)\SAX2Print.obj"
 	-@erase "$(INTDIR)\SAX2PrintHandlers.obj"
-	-@erase "$(INTDIR)\SAX2FilterHandlers.obj"
 	-@erase "$(INTDIR)\vc60.idb"
 	-@erase "$(INTDIR)\vc60.pdb"
 	-@erase "$(OUTDIR)\SAX2Print.exe"
@@ -152,51 +122,18 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\SAX2Print.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAX2Print.pdb" /debug /machine:I386 /out:"$(OUTDIR)\SAX2Print.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAX2Print.pdb" /debug /machine:I386 /out:"$(OUTDIR)\SAX2Print.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
+	"$(INTDIR)\SAX2FilterHandlers.obj" \
 	"$(INTDIR)\SAX2Print.obj" \
 	"$(INTDIR)\SAX2PrintHandlers.obj" \
-	"$(INTDIR)\SAX2FilterHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\SAX2Print.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -226,9 +163,9 @@ CLEAN :"XercesLib - Win64 DebugCLEAN"
 !ELSE 
 CLEAN :
 !ENDIF 
+	-@erase "$(INTDIR)\SAX2FilterHandlers.obj"
 	-@erase "$(INTDIR)\SAX2Print.obj"
 	-@erase "$(INTDIR)\SAX2PrintHandlers.obj"
-	-@erase "$(INTDIR)\SAX2FilterHandlers.obj"
 	-@erase "$(INTDIR)\vc60.idb"
 	-@erase "$(INTDIR)\vc60.pdb"
 	-@erase "$(OUTDIR)\SAX2Print.exe"
@@ -241,51 +178,18 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\SAX2Print.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAX2Print.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\SAX2Print.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAX2Print.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\SAX2Print.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
+	"$(INTDIR)\SAX2FilterHandlers.obj" \
 	"$(INTDIR)\SAX2Print.obj" \
 	"$(INTDIR)\SAX2PrintHandlers.obj" \
-	"$(INTDIR)\SAX2FilterHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\SAX2Print.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -315,9 +219,9 @@ CLEAN :"XercesLib - Win64 ReleaseCLEAN"
 !ELSE 
 CLEAN :
 !ENDIF 
+	-@erase "$(INTDIR)\SAX2FilterHandlers.obj"
 	-@erase "$(INTDIR)\SAX2Print.obj"
 	-@erase "$(INTDIR)\SAX2PrintHandlers.obj"
-	-@erase "$(INTDIR)\SAX2FilterHandlers.obj"
 	-@erase "$(INTDIR)\vc60.idb"
 	-@erase "$(OUTDIR)\SAX2Print.exe"
 	-@erase "$(OUTDIR)\SAX2Print.ilk"
@@ -328,8 +232,25 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\SAX2Print.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAX2Print.pdb" /machine:IX86 /out:"$(OUTDIR)\SAX2Print.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\SAX2FilterHandlers.obj" \
+	"$(INTDIR)\SAX2Print.obj" \
+	"$(INTDIR)\SAX2PrintHandlers.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\SAX2Print.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -361,26 +282,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\SAX2Print.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAX2Print.pdb" /machine:IX86 /out:"$(OUTDIR)\SAX2Print.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\SAX2Print.obj" \
-	"$(INTDIR)\SAX2PrintHandlers.obj" \
-	"$(INTDIR)\SAX2FilterHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\SAX2Print.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("SAX2Print.dep")
@@ -443,19 +344,19 @@ LINK32_OBJS= \
 
 !ENDIF 
 
-SOURCE=..\..\..\..\..\samples\SAX2Print\SAX2FilterHandlers.cpp
+SOURCE=..\..\..\..\..\samples\src\SAX2Print\SAX2FilterHandlers.cpp
 
 "$(INTDIR)\SAX2FilterHandlers.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=..\..\..\..\..\samples\SAX2Print\SAX2Print.cpp
+SOURCE=..\..\..\..\..\samples\src\SAX2Print\SAX2Print.cpp
 
 "$(INTDIR)\SAX2Print.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=..\..\..\..\..\samples\SAX2Print\SAX2PrintHandlers.cpp
+SOURCE=..\..\..\..\..\samples\src\SAX2Print\SAX2PrintHandlers.cpp
 
 "$(INTDIR)\SAX2PrintHandlers.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/SAXCount/SAXCount.mak b/Projects/Win32/VC6/xerces-all/SAXCount/SAXCount.mak
index 479a86d94..4a205c6b2 100644
--- a/Projects/Win32/VC6/xerces-all/SAXCount/SAXCount.mak
+++ b/Projects/Win32/VC6/xerces-all/SAXCount/SAXCount.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "SAXCount - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -62,50 +65,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\SAXCount.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAXCount.pdb" /machine:I386 /out:"$(OUTDIR)\SAXCount.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAXCount.pdb" /machine:I386 /out:"$(OUTDIR)\SAXCount.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\SAXCount.obj" \
 	"$(INTDIR)\SAXCountHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\SAXCount.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -149,50 +119,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\SAXCount.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAXCount.pdb" /debug /machine:I386 /out:"$(OUTDIR)\SAXCount.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAXCount.pdb" /debug /machine:I386 /out:"$(OUTDIR)\SAXCount.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\SAXCount.obj" \
 	"$(INTDIR)\SAXCountHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\SAXCount.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -236,50 +173,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\SAXCount.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAXCount.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\SAXCount.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAXCount.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\SAXCount.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\SAXCount.obj" \
 	"$(INTDIR)\SAXCountHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\SAXCount.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -321,8 +225,24 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\SAXCount.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAXCount.pdb" /machine:IX86 /out:"$(OUTDIR)\SAXCount.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\SAXCount.obj" \
+	"$(INTDIR)\SAXCountHandlers.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\SAXCount.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -354,25 +274,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\SAXCount.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAXCount.pdb" /machine:IX86 /out:"$(OUTDIR)\SAXCount.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\SAXCount.obj" \
-	"$(INTDIR)\SAXCountHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\SAXCount.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("SAXCount.dep")
@@ -435,13 +336,13 @@ LINK32_OBJS= \
 
 !ENDIF 
 
-SOURCE=..\..\..\..\..\samples\SAXCount\SAXCount.cpp
+SOURCE=..\..\..\..\..\samples\src\SAXCount\SAXCount.cpp
 
 "$(INTDIR)\SAXCount.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=..\..\..\..\..\samples\SAXCount\SAXCountHandlers.cpp
+SOURCE=..\..\..\..\..\samples\src\SAXCount\SAXCountHandlers.cpp
 
 "$(INTDIR)\SAXCountHandlers.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/SAXPrint/SAXPrint.mak b/Projects/Win32/VC6/xerces-all/SAXPrint/SAXPrint.mak
index dda750717..27bf7deae 100644
--- a/Projects/Win32/VC6/xerces-all/SAXPrint/SAXPrint.mak
+++ b/Projects/Win32/VC6/xerces-all/SAXPrint/SAXPrint.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "SAXPrint - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -62,50 +65,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\SAXPrint.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAXPrint.pdb" /machine:I386 /out:"$(OUTDIR)\SAXPrint.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAXPrint.pdb" /machine:I386 /out:"$(OUTDIR)\SAXPrint.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\SAXPrint.obj" \
 	"$(INTDIR)\SAXPrintHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\SAXPrint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -149,50 +119,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\SAXPrint.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAXPrint.pdb" /debug /machine:I386 /out:"$(OUTDIR)\SAXPrint.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAXPrint.pdb" /debug /machine:I386 /out:"$(OUTDIR)\SAXPrint.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\SAXPrint.obj" \
 	"$(INTDIR)\SAXPrintHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\SAXPrint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -236,50 +173,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\SAXPrint.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAXPrint.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\SAXPrint.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAXPrint.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\SAXPrint.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\SAXPrint.obj" \
 	"$(INTDIR)\SAXPrintHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\SAXPrint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -321,8 +225,24 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\SAXPrint.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAXPrint.pdb" /machine:IX86 /out:"$(OUTDIR)\SAXPrint.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\SAXPrint.obj" \
+	"$(INTDIR)\SAXPrintHandlers.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\SAXPrint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -354,25 +274,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\SAXPrint.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SAXPrint.pdb" /machine:IX86 /out:"$(OUTDIR)\SAXPrint.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\SAXPrint.obj" \
-	"$(INTDIR)\SAXPrintHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\SAXPrint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("SAXPrint.dep")
@@ -435,13 +336,13 @@ LINK32_OBJS= \
 
 !ENDIF 
 
-SOURCE=..\..\..\..\..\samples\SAXPrint\SAXPrint.cpp
+SOURCE=..\..\..\..\..\samples\src\SAXPrint\SAXPrint.cpp
 
 "$(INTDIR)\SAXPrint.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=..\..\..\..\..\samples\SAXPrint\SAXPrintHandlers.cpp
+SOURCE=..\..\..\..\..\samples\src\SAXPrint\SAXPrintHandlers.cpp
 
 "$(INTDIR)\SAXPrintHandlers.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/SCMPrint/SCMPrint.mak b/Projects/Win32/VC6/xerces-all/SCMPrint/SCMPrint.mak
index 10831ccac..5864e8d14 100644
--- a/Projects/Win32/VC6/xerces-all/SCMPrint/SCMPrint.mak
+++ b/Projects/Win32/VC6/xerces-all/SCMPrint/SCMPrint.mak
@@ -27,7 +27,7 @@ NULL=
 NULL=nul
 !ENDIF 
 
-CPP=$(CPP)
+CPP=cl.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "SCMPrint - Win32 Release"
@@ -64,16 +64,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\SCMPrint.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SCMPrint.pdb" /machine:I386 /out:"$(OUTDIR)\SCMPrint.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SCMPrint.pdb" /machine:I386 /out:"$(OUTDIR)\SCMPrint.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\SCMPrint.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\SCMPrint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -116,16 +116,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_CONSOLE" /D "PLATFORM_WIN32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\SCMPrint.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SCMPrint.pdb" /debug /machine:I386 /out:"$(OUTDIR)\SCMPrint.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SCMPrint.pdb" /debug /machine:I386 /out:"$(OUTDIR)\SCMPrint.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\SCMPrint.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\SCMPrint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -168,16 +168,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\SCMPrint.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SCMPrint.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\SCMPrint.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SCMPrint.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\SCMPrint.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\SCMPrint.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\SCMPrint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -218,16 +218,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\SCMPrint.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SCMPrint.pdb" /machine:IX86 /out:"$(OUTDIR)\SCMPrint.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SCMPrint.pdb" /machine:IX86 /out:"$(OUTDIR)\SCMPrint.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\SCMPrint.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\SCMPrint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -328,7 +328,7 @@ LINK32_OBJS= \
 
 !ENDIF 
 
-SOURCE=..\..\..\..\..\samples\SCMPrint\SCMPrint.cpp
+SOURCE=..\..\..\..\..\samples\src\SCMPrint\SCMPrint.cpp
 
 "$(INTDIR)\SCMPrint.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/SEnumVal/SEnumVal.mak b/Projects/Win32/VC6/xerces-all/SEnumVal/SEnumVal.mak
index 270dcc06e..fe32b1c56 100644
--- a/Projects/Win32/VC6/xerces-all/SEnumVal/SEnumVal.mak
+++ b/Projects/Win32/VC6/xerces-all/SEnumVal/SEnumVal.mak
@@ -2,30 +2,33 @@
 !IF "$(CFG)" == ""
 CFG=SEnumVal - Win32 Debug
 !MESSAGE No configuration specified. Defaulting to SEnumVal - Win32 Debug.
-!ENDIF
+!ENDIF 
 
 !IF "$(CFG)" != "SEnumVal - Win32 Release" && "$(CFG)" != "SEnumVal - Win32 Debug" && "$(CFG)" != "SEnumVal - Win64 Debug" && "$(CFG)" != "SEnumVal - Win64 Release"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "SEnumVal.mak" CFG="SEnumVal - Win32 Debug"
-!MESSAGE
+!MESSAGE 
 !MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE 
 !MESSAGE "SEnumVal - Win32 Release" (based on "Win32 (x86) Console Application")
 !MESSAGE "SEnumVal - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE "SEnumVal - Win64 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE "SEnumVal - Win64 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE 
 !ERROR An invalid configuration is specified.
-!ENDIF
+!ENDIF 
 
 !IF "$(OS)" == "Windows_NT"
 NULL=
-!ELSE
+!ELSE 
 NULL=nul
-!ENDIF
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
 
 !IF  "$(CFG)" == "SEnumVal - Win32 Release"
 
@@ -35,23 +38,25 @@ INTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release\obj
 OutDir=.\..\..\..\..\..\Build\Win32\VC6\Release
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0" 
 
-ALL : "$(OUTDIR)\SEnumVal.exe"
+ALL : "$(OUTDIR)\SEnumVal.exe" "$(OUTDIR)\SEnumVal.bsc"
 
-!ELSE
+!ELSE 
 
-ALL : "XercesLib - Win32 Release" "$(OUTDIR)\SEnumVal.exe"
+ALL : "XercesLib - Win32 Release" "$(OUTDIR)\SEnumVal.exe" "$(OUTDIR)\SEnumVal.bsc"
 
-!ENDIF
+!ENDIF 
 
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win32 ReleaseCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1" 
+CLEAN :"XercesLib - Win32 ReleaseCLEAN" 
+!ELSE 
 CLEAN :
-!ENDIF
+!ENDIF 
 	-@erase "$(INTDIR)\SEnumVal.obj"
+	-@erase "$(INTDIR)\SEnumVal.sbr"
 	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(OUTDIR)\SEnumVal.bsc"
 	-@erase "$(OUTDIR)\SEnumVal.exe"
 	-@erase "$(OUTDIR)\SEnumVal.ilk"
 
@@ -61,49 +66,22 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\SEnumVal.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\SEnumVal.bsc" 
 BSC32_SBRS= \
+	"$(INTDIR)\SEnumVal.sbr"
+
+"$(OUTDIR)\SEnumVal.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
 
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SEnumVal.pdb" /machine:I386 /out:"$(OUTDIR)\SEnumVal.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SEnumVal.pdb" /machine:I386 /out:"$(OUTDIR)\SEnumVal.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\SEnumVal.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\SEnumVal.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -118,21 +96,21 @@ INTDIR=.\..\..\..\..\..\Build\Win32\VC6\Debug\obj
 OutDir=.\..\..\..\..\..\Build\Win32\VC6\Debug
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0" 
 
 ALL : "$(OUTDIR)\SEnumVal.exe"
 
-!ELSE
+!ELSE 
 
 ALL : "XercesLib - Win32 Debug" "$(OUTDIR)\SEnumVal.exe"
 
-!ENDIF
+!ENDIF 
 
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win32 DebugCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1" 
+CLEAN :"XercesLib - Win32 DebugCLEAN" 
+!ELSE 
 CLEAN :
-!ENDIF
+!ENDIF 
 	-@erase "$(INTDIR)\SEnumVal.obj"
 	-@erase "$(INTDIR)\vc60.idb"
 	-@erase "$(INTDIR)\vc60.pdb"
@@ -146,49 +124,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\SEnumVal.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\SEnumVal.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SEnumVal.pdb" /debug /machine:I386 /out:"$(OUTDIR)\SEnumVal.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SEnumVal.pdb" /debug /machine:I386 /out:"$(OUTDIR)\SEnumVal.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\SEnumVal.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\SEnumVal.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -203,21 +148,21 @@ INTDIR=.\..\..\..\..\..\Build\Win64\VC6\Debug\obj
 OutDir=.\..\..\..\..\..\Build\Win64\VC6\Debug
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0" 
 
 ALL : "$(OUTDIR)\SEnumVal.exe"
 
-!ELSE
+!ELSE 
 
 ALL : "XercesLib - Win64 Debug" "$(OUTDIR)\SEnumVal.exe"
 
-!ENDIF
+!ENDIF 
 
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win64 DebugCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1" 
+CLEAN :"XercesLib - Win64 DebugCLEAN" 
+!ELSE 
 CLEAN :
-!ENDIF
+!ENDIF 
 	-@erase "$(INTDIR)\SEnumVal.obj"
 	-@erase "$(INTDIR)\vc60.idb"
 	-@erase "$(INTDIR)\vc60.pdb"
@@ -231,49 +176,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\SEnumVal.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\SEnumVal.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SEnumVal.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\SEnumVal.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SEnumVal.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\SEnumVal.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\SEnumVal.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\SEnumVal.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -288,23 +200,25 @@ INTDIR=.\..\..\..\..\..\Build\Win64\VC6\Release\obj
 OutDir=.\..\..\..\..\..\Build\Win64\VC6\Release
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0" 
 
-ALL : "$(OUTDIR)\SEnumVal.exe"
+ALL : "$(OUTDIR)\SEnumVal.exe" "$(OUTDIR)\SEnumVal.bsc"
 
-!ELSE
+!ELSE 
 
-ALL : "XercesLib - Win64 Release" "$(OUTDIR)\SEnumVal.exe"
+ALL : "XercesLib - Win64 Release" "$(OUTDIR)\SEnumVal.exe" "$(OUTDIR)\SEnumVal.bsc"
 
-!ENDIF
+!ENDIF 
 
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win64 ReleaseCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1" 
+CLEAN :"XercesLib - Win64 ReleaseCLEAN" 
+!ELSE 
 CLEAN :
-!ENDIF
+!ENDIF 
 	-@erase "$(INTDIR)\SEnumVal.obj"
+	-@erase "$(INTDIR)\SEnumVal.sbr"
 	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(OUTDIR)\SEnumVal.bsc"
 	-@erase "$(OUTDIR)\SEnumVal.exe"
 	-@erase "$(OUTDIR)\SEnumVal.ilk"
 
@@ -314,125 +228,154 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\SEnumVal.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\SEnumVal.sbr"
+
+"$(OUTDIR)\SEnumVal.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SEnumVal.pdb" /machine:IX86 /out:"$(OUTDIR)\SEnumVal.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\SEnumVal.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\SEnumVal.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $<
+   $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $<
+   $(CPP_PROJ) $< 
 <<
 
 .cxx{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $<
+   $(CPP_PROJ) $< 
 <<
 
 .c{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $<
+   $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $<
+   $(CPP_PROJ) $< 
 <<
 
 .cxx{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $<
+   $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\SEnumVal.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\SEnumVal.pdb" /machine:IX86 /out:"$(OUTDIR)\SEnumVal.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-LINK32_OBJS= \
-	"$(INTDIR)\SEnumVal.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\SEnumVal.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("SEnumVal.dep")
 !INCLUDE "SEnumVal.dep"
-!ELSE
+!ELSE 
 !MESSAGE Warning: cannot find "SEnumVal.dep"
-!ENDIF
-!ENDIF
+!ENDIF 
+!ENDIF 
 
 
 !IF "$(CFG)" == "SEnumVal - Win32 Release" || "$(CFG)" == "SEnumVal - Win32 Debug" || "$(CFG)" == "SEnumVal - Win64 Debug" || "$(CFG)" == "SEnumVal - Win64 Release"
 
 !IF  "$(CFG)" == "SEnumVal - Win32 Release"
 
-"XercesLib - Win32 Release" :
+"XercesLib - Win32 Release" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Release"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Release" 
    cd "..\SEnumVal"
 
-"XercesLib - Win32 ReleaseCLEAN" :
+"XercesLib - Win32 ReleaseCLEAN" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Release" RECURSE=1 CLEAN
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Release" RECURSE=1 CLEAN 
    cd "..\SEnumVal"
 
 !ELSEIF  "$(CFG)" == "SEnumVal - Win32 Debug"
 
-"XercesLib - Win32 Debug" :
+"XercesLib - Win32 Debug" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug" 
    cd "..\SEnumVal"
 
-"XercesLib - Win32 DebugCLEAN" :
+"XercesLib - Win32 DebugCLEAN" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug" RECURSE=1 CLEAN
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\SEnumVal"
 
 !ELSEIF  "$(CFG)" == "SEnumVal - Win64 Debug"
 
-"XercesLib - Win64 Debug" :
+"XercesLib - Win64 Debug" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug" 
    cd "..\SEnumVal"
 
-"XercesLib - Win64 DebugCLEAN" :
+"XercesLib - Win64 DebugCLEAN" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug" RECURSE=1 CLEAN
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug" RECURSE=1 CLEAN 
    cd "..\SEnumVal"
 
 !ELSEIF  "$(CFG)" == "SEnumVal - Win64 Release"
 
-"XercesLib - Win64 Release" :
+"XercesLib - Win64 Release" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Release"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Release" 
    cd "..\SEnumVal"
 
-"XercesLib - Win64 ReleaseCLEAN" :
+"XercesLib - Win64 ReleaseCLEAN" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Release" RECURSE=1 CLEAN
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Release" RECURSE=1 CLEAN 
    cd "..\SEnumVal"
 
-!ENDIF
+!ENDIF 
+
+SOURCE=..\..\..\..\..\samples\src\SEnumVal\SEnumVal.cpp
+
+!IF  "$(CFG)" == "SEnumVal - Win32 Release"
+
+
+"$(INTDIR)\SEnumVal.obj"	"$(INTDIR)\SEnumVal.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "SEnumVal - Win32 Debug"
+
+
+"$(INTDIR)\SEnumVal.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "SEnumVal - Win64 Debug"
 
-SOURCE=..\..\..\..\..\samples\SEnumVal\SEnumVal.cpp
 
 "$(INTDIR)\SEnumVal.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ELSEIF  "$(CFG)" == "SEnumVal - Win64 Release"
+
+
+"$(INTDIR)\SEnumVal.obj"	"$(INTDIR)\SEnumVal.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
 
-!ENDIF
+!ENDIF 
 
diff --git a/Projects/Win32/VC6/xerces-all/StdInParse/StdInParse.mak b/Projects/Win32/VC6/xerces-all/StdInParse/StdInParse.mak
index 70334d11d..1c4eb7a62 100644
--- a/Projects/Win32/VC6/xerces-all/StdInParse/StdInParse.mak
+++ b/Projects/Win32/VC6/xerces-all/StdInParse/StdInParse.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "StdInParse - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -62,50 +65,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\StdInParse.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\StdInParse.pdb" /machine:I386 /out:"$(OUTDIR)\StdInParse.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\StdInParse.pdb" /machine:I386 /out:"$(OUTDIR)\StdInParse.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\StdInParse.obj" \
 	"$(INTDIR)\StdInParseHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\StdInParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -149,50 +119,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\StdInParse.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\StdInParse.pdb" /debug /machine:I386 /out:"$(OUTDIR)\StdInParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\StdInParse.pdb" /debug /machine:I386 /out:"$(OUTDIR)\StdInParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\StdInParse.obj" \
 	"$(INTDIR)\StdInParseHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\StdInParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -236,50 +173,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\StdInParse.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\StdInParse.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\StdInParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\StdInParse.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\StdInParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\StdInParse.obj" \
 	"$(INTDIR)\StdInParseHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\StdInParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -321,8 +225,24 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\StdInParse.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\StdInParse.pdb" /machine:IX86 /out:"$(OUTDIR)\StdInParse.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\StdInParse.obj" \
+	"$(INTDIR)\StdInParseHandlers.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\StdInParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -354,25 +274,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\StdInParse.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\StdInParse.pdb" /machine:IX86 /out:"$(OUTDIR)\StdInParse.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\StdInParse.obj" \
-	"$(INTDIR)\StdInParseHandlers.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\StdInParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("StdInParse.dep")
@@ -384,13 +285,13 @@ LINK32_OBJS= \
 
 
 !IF "$(CFG)" == "StdInParse - Win32 Release" || "$(CFG)" == "StdInParse - Win32 Debug" || "$(CFG)" == "StdInParse - Win64 Debug" || "$(CFG)" == "StdInParse - Win64 Release"
-SOURCE=..\..\..\..\..\samples\StdInParse\StdInParse.cpp
+SOURCE=..\..\..\..\..\samples\src\StdInParse\StdInParse.cpp
 
 "$(INTDIR)\StdInParse.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=..\..\..\..\..\samples\StdInParse\StdInParseHandlers.cpp
+SOURCE=..\..\..\..\..\samples\src\StdInParse\StdInParseHandlers.cpp
 
 "$(INTDIR)\StdInParseHandlers.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/ThreadTest/ThreadTest.mak b/Projects/Win32/VC6/xerces-all/ThreadTest/ThreadTest.mak
index 1166967f6..4f596f01a 100644
--- a/Projects/Win32/VC6/xerces-all/ThreadTest/ThreadTest.mak
+++ b/Projects/Win32/VC6/xerces-all/ThreadTest/ThreadTest.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "ThreadTest - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -60,49 +63,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\ThreadTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /incremental:no /pdb:"$(OUTDIR)\ThreadTest.pdb" /machine:I386 /out:"$(OUTDIR)\ThreadTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:no /pdb:"$(OUTDIR)\ThreadTest.pdb" /machine:I386 /out:"$(OUTDIR)\ThreadTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\ThreadTest.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\ThreadTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -145,49 +115,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\ThreadTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\ThreadTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\ThreadTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\ThreadTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\ThreadTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\ThreadTest.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\ThreadTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -230,49 +167,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\ThreadTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\ThreadTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\ThreadTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\ThreadTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\ThreadTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\ThreadTest.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\ThreadTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -313,8 +217,23 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\ThreadTest.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\ThreadTest.pdb" /machine:IX86 /out:"$(OUTDIR)\ThreadTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\ThreadTest.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\ThreadTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -346,24 +265,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\ThreadTest.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\ThreadTest.pdb" /machine:IX86 /out:"$(OUTDIR)\ThreadTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\ThreadTest.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\ThreadTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("ThreadTest.dep")
@@ -375,7 +276,7 @@ LINK32_OBJS= \
 
 
 !IF "$(CFG)" == "ThreadTest - Win32 Release" || "$(CFG)" == "ThreadTest - Win32 Debug" || "$(CFG)" == "ThreadTest - Win64 Debug" || "$(CFG)" == "ThreadTest - Win64 Release"
-SOURCE=..\..\..\..\..\tests\ThreadTest\ThreadTest.cpp
+SOURCE=..\..\..\..\..\tests\src\ThreadTest\ThreadTest.cpp
 
 "$(INTDIR)\ThreadTest.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/XInclude/XInclude.dsp b/Projects/Win32/VC6/xerces-all/XInclude/XInclude.dsp
new file mode 100644
index 000000000..01413bcf8
--- /dev/null
+++ b/Projects/Win32/VC6/xerces-all/XInclude/XInclude.dsp
@@ -0,0 +1,146 @@
+# Microsoft Developer Studio Project File - Name="XInclude" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=XInclude - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "XInclude.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "XInclude.mak" CFG="XInclude - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "XInclude - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "XInclude - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "XInclude - Win64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "XInclude - Win64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "XInclude - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\..\Build\Win32\VC6\Release"
+# PROP Intermediate_Dir "..\..\..\..\..\Build\Win32\VC6\Release\obj"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /FR /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:yes /machine:I386 /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+
+!ELSEIF  "$(CFG)" == "XInclude - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\..\Build\Win32\VC6\Debug"
+# PROP Intermediate_Dir "..\..\..\..\..\Build\Win32\VC6\Debug\obj"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+
+!ELSEIF  "$(CFG)" == "XInclude - Win64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\..\Build\Win64\VC6\Debug"
+# PROP Intermediate_Dir "..\..\..\..\..\Build\Win64\VC6\Debug\obj"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+# ADD LINK32 kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "XInclude - Win64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\..\Build\Win64\VC6\Release"
+# PROP Intermediate_Dir "..\..\..\..\..\Build\Win64\VC6\Release\obj"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FR /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /FR /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /incremental:yes /machine:IX86 /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+# ADD LINK32 kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:yes /machine:IX86 /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF 
+
+# Begin Target
+
+# Name "XInclude - Win32 Release"
+# Name "XInclude - Win32 Debug"
+# Name "XInclude - Win64 Debug"
+# Name "XInclude - Win64 Release"
+# Begin Source File
+
+SOURCE=..\..\..\..\..\samples\src\XInclude\XInclude.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\samples\src\XInclude\XInclude.hpp
+# End Source File
+# End Target
+# End Project
diff --git a/Projects/Win32/VC6/xerces-all/XInclude/XInclude.mak b/Projects/Win32/VC6/xerces-all/XInclude/XInclude.mak
new file mode 100644
index 000000000..e995440d5
--- /dev/null
+++ b/Projects/Win32/VC6/xerces-all/XInclude/XInclude.mak
@@ -0,0 +1,381 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on XInclude.dsp
+!IF "$(CFG)" == ""
+CFG=XInclude - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to XInclude - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "XInclude - Win32 Release" && "$(CFG)" != "XInclude - Win32 Debug" && "$(CFG)" != "XInclude - Win64 Debug" && "$(CFG)" != "XInclude - Win64 Release"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "XInclude.mak" CFG="XInclude - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "XInclude - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "XInclude - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "XInclude - Win64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "XInclude - Win64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "XInclude - Win32 Release"
+
+OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
+INTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release\obj
+# Begin Custom Macros
+OutDir=.\..\..\..\..\..\Build\Win32\VC6\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\XInclude.exe" "$(OUTDIR)\XInclude.bsc"
+
+!ELSE 
+
+ALL : "XercesLib - Win32 Release" "$(OUTDIR)\XInclude.exe" "$(OUTDIR)\XInclude.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"XercesLib - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\XInclude.obj"
+	-@erase "$(INTDIR)\XInclude.sbr"
+	-@erase "$(OUTDIR)\XInclude.bsc"
+	-@erase "$(OUTDIR)\XInclude.exe"
+	-@erase "$(OUTDIR)\XInclude.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+"$(INTDIR)" :
+    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
+
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\XInclude.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\XInclude.sbr"
+
+"$(OUTDIR)\XInclude.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\XInclude.pdb" /machine:I386 /out:"$(OUTDIR)\XInclude.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_OBJS= \
+	"$(INTDIR)\XInclude.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\XInclude.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "XInclude - Win32 Debug"
+
+OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Debug
+INTDIR=.\..\..\..\..\..\Build\Win32\VC6\Debug\obj
+# Begin Custom Macros
+OutDir=.\..\..\..\..\..\Build\Win32\VC6\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\XInclude.exe"
+
+!ELSE 
+
+ALL : "XercesLib - Win32 Debug" "$(OUTDIR)\XInclude.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"XercesLib - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(INTDIR)\XInclude.obj"
+	-@erase "$(OUTDIR)\XInclude.exe"
+	-@erase "$(OUTDIR)\XInclude.ilk"
+	-@erase "$(OUTDIR)\XInclude.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+"$(INTDIR)" :
+    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
+
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\XInclude.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\XInclude.pdb" /debug /machine:I386 /out:"$(OUTDIR)\XInclude.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_OBJS= \
+	"$(INTDIR)\XInclude.obj" \
+	"$(OUTDIR)\xerces-c_3D.lib"
+
+"$(OUTDIR)\XInclude.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "XInclude - Win64 Debug"
+
+OUTDIR=.\..\..\..\..\..\Build\Win64\VC6\Debug
+INTDIR=.\..\..\..\..\..\Build\Win64\VC6\Debug\obj
+# Begin Custom Macros
+OutDir=.\..\..\..\..\..\Build\Win64\VC6\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\XInclude.exe"
+
+!ELSE 
+
+ALL : "XercesLib - Win64 Debug" "$(OUTDIR)\XInclude.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"XercesLib - Win64 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(INTDIR)\XInclude.obj"
+	-@erase "$(OUTDIR)\XInclude.exe"
+	-@erase "$(OUTDIR)\XInclude.ilk"
+	-@erase "$(OUTDIR)\XInclude.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+"$(INTDIR)" :
+    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
+
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\XInclude.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\XInclude.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\XInclude.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\XInclude.obj" \
+	"$(OUTDIR)\xerces-c_3D.lib"
+
+"$(OUTDIR)\XInclude.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "XInclude - Win64 Release"
+
+OUTDIR=.\..\..\..\..\..\Build\Win64\VC6\Release
+INTDIR=.\..\..\..\..\..\Build\Win64\VC6\Release\obj
+# Begin Custom Macros
+OutDir=.\..\..\..\..\..\Build\Win64\VC6\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\XInclude.exe" "$(OUTDIR)\XInclude.bsc"
+
+!ELSE 
+
+ALL : "XercesLib - Win64 Release" "$(OUTDIR)\XInclude.exe" "$(OUTDIR)\XInclude.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"XercesLib - Win64 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\XInclude.obj"
+	-@erase "$(INTDIR)\XInclude.sbr"
+	-@erase "$(OUTDIR)\XInclude.bsc"
+	-@erase "$(OUTDIR)\XInclude.exe"
+	-@erase "$(OUTDIR)\XInclude.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+"$(INTDIR)" :
+    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
+
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\XInclude.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\XInclude.sbr"
+
+"$(OUTDIR)\XInclude.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\XInclude.pdb" /machine:IX86 /out:"$(OUTDIR)\XInclude.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\XInclude.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\XInclude.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("XInclude.dep")
+!INCLUDE "XInclude.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "XInclude.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "XInclude - Win32 Release" || "$(CFG)" == "XInclude - Win32 Debug" || "$(CFG)" == "XInclude - Win64 Debug" || "$(CFG)" == "XInclude - Win64 Release"
+
+!IF  "$(CFG)" == "XInclude - Win32 Release"
+
+"XercesLib - Win32 Release" : 
+   cd "..\XercesLib"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Release" 
+   cd "..\XInclude"
+
+"XercesLib - Win32 ReleaseCLEAN" : 
+   cd "..\XercesLib"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\XInclude"
+
+!ELSEIF  "$(CFG)" == "XInclude - Win32 Debug"
+
+"XercesLib - Win32 Debug" : 
+   cd "..\XercesLib"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug" 
+   cd "..\XInclude"
+
+"XercesLib - Win32 DebugCLEAN" : 
+   cd "..\XercesLib"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\XInclude"
+
+!ELSEIF  "$(CFG)" == "XInclude - Win64 Debug"
+
+"XercesLib - Win64 Debug" : 
+   cd "..\XercesLib"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug" 
+   cd "..\XInclude"
+
+"XercesLib - Win64 DebugCLEAN" : 
+   cd "..\XercesLib"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug" RECURSE=1 CLEAN 
+   cd "..\XInclude"
+
+!ELSEIF  "$(CFG)" == "XInclude - Win64 Release"
+
+"XercesLib - Win64 Release" : 
+   cd "..\XercesLib"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Release" 
+   cd "..\XInclude"
+
+"XercesLib - Win64 ReleaseCLEAN" : 
+   cd "..\XercesLib"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Release" RECURSE=1 CLEAN 
+   cd "..\XInclude"
+
+!ENDIF 
+
+SOURCE=..\..\..\..\..\samples\src\XInclude\XInclude.cpp
+
+!IF  "$(CFG)" == "XInclude - Win32 Release"
+
+
+"$(INTDIR)\XInclude.obj"	"$(INTDIR)\XInclude.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "XInclude - Win32 Debug"
+
+
+"$(INTDIR)\XInclude.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "XInclude - Win64 Debug"
+
+
+"$(INTDIR)\XInclude.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "XInclude - Win64 Release"
+
+
+"$(INTDIR)\XInclude.obj"	"$(INTDIR)\XInclude.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/Projects/Win32/VC6/xerces-all/XSValueTest/XSValueTest.mak b/Projects/Win32/VC6/xerces-all/XSValueTest/XSValueTest.mak
index d8d136aef..4522e979d 100644
--- a/Projects/Win32/VC6/xerces-all/XSValueTest/XSValueTest.mak
+++ b/Projects/Win32/VC6/xerces-all/XSValueTest/XSValueTest.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "XSValueTest - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -60,49 +63,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\XSValueTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /incremental:no /pdb:"$(OUTDIR)\XSValueTest.pdb" /machine:I386 /out:"$(OUTDIR)\XSValueTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:no /pdb:"$(OUTDIR)\XSValueTest.pdb" /machine:I386 /out:"$(OUTDIR)\XSValueTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\XSValueTest.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\XSValueTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -145,49 +115,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\XSValueTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\XSValueTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\XSValueTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\XSValueTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\XSValueTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\XSValueTest.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\XSValueTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -230,49 +167,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\XSValueTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\XSValueTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\XSValueTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\XSValueTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\XSValueTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\XSValueTest.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\XSValueTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -313,8 +217,23 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\XSValueTest.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\XSValueTest.pdb" /machine:IX86 /out:"$(OUTDIR)\XSValueTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\XSValueTest.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\XSValueTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -346,24 +265,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\XSValueTest.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\XSValueTest.pdb" /machine:IX86 /out:"$(OUTDIR)\XSValueTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\XSValueTest.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\XSValueTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("XSValueTest.dep")
@@ -375,7 +276,7 @@ LINK32_OBJS= \
 
 
 !IF "$(CFG)" == "XSValueTest - Win32 Release" || "$(CFG)" == "XSValueTest - Win32 Debug" || "$(CFG)" == "XSValueTest - Win64 Debug" || "$(CFG)" == "XSValueTest - Win64 Release"
-SOURCE=..\..\..\..\..\tests\XSValueTest\XSValueTest.cpp
+SOURCE=..\..\..\..\..\tests\src\XSValueTest\XSValueTest.cpp
 
 "$(INTDIR)\XSValueTest.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/XSerializerTest/XSerializerTest.mak b/Projects/Win32/VC6/xerces-all/XSerializerTest/XSerializerTest.mak
index 8068af81b..ce7e241dc 100644
--- a/Projects/Win32/VC6/xerces-all/XSerializerTest/XSerializerTest.mak
+++ b/Projects/Win32/VC6/xerces-all/XSerializerTest/XSerializerTest.mak
@@ -27,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "XSerializerTest - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -61,50 +64,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\XSerializerTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /incremental:no /pdb:"$(OUTDIR)\XSerializerTest.pdb" /machine:I386 /out:"$(OUTDIR)\XSerializerTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:no /pdb:"$(OUTDIR)\XSerializerTest.pdb" /machine:I386 /out:"$(OUTDIR)\XSerializerTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\XSerializerHandlers.obj" \
 	"$(INTDIR)\XSerializerTest.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
+	"$(OUTDIR)\xerces-c_3.lib"
 
 "$(OUTDIR)\XSerializerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -148,50 +118,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\XSerializerTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\XSerializerTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\XSerializerTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\XSerializerTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\XSerializerTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\XSerializerHandlers.obj" \
 	"$(INTDIR)\XSerializerTest.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\XSerializerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -235,50 +172,17 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\XSerializerTest.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\XSerializerTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\XSerializerTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\XSerializerTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\XSerializerTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\XSerializerHandlers.obj" \
 	"$(INTDIR)\XSerializerTest.obj" \
-	"$(OUTDIR)\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\XSerializerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -320,8 +224,24 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\XSerializerTest.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\XSerializerTest.pdb" /machine:IX86 /out:"$(OUTDIR)\XSerializerTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
+LINK32_OBJS= \
+	"$(INTDIR)\XSerializerHandlers.obj" \
+	"$(INTDIR)\XSerializerTest.obj" \
+	"$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\XSerializerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -353,25 +273,6 @@ CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\XSerializerTest.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\XSerializerTest.pdb" /machine:IX86 /out:"$(OUTDIR)\XSerializerTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64 
-LINK32_OBJS= \
-	"$(INTDIR)\XSerializerHandlers.obj" \
-	"$(INTDIR)\XSerializerTest.obj" \
-	"$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\XSerializerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("XSerializerTest.dep")
@@ -383,13 +284,13 @@ LINK32_OBJS= \
 
 
 !IF "$(CFG)" == "XSerializerTest - Win32 Release" || "$(CFG)" == "XSerializerTest - Win32 Debug" || "$(CFG)" == "XSerializerTest - Win64 Debug" || "$(CFG)" == "XSerializerTest - Win64 Release"
-SOURCE=..\..\..\..\..\tests\XSerializerTest\XSerializerHandlers.cpp
+SOURCE=..\..\..\..\..\tests\src\XSerializerTest\XSerializerHandlers.cpp
 
 "$(INTDIR)\XSerializerHandlers.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=..\..\..\..\..\tests\XSerializerTest\XSerializerTest.cpp
+SOURCE=..\..\..\..\..\tests\src\XSerializerTest\XSerializerTest.cpp
 
 "$(INTDIR)\XSerializerTest.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
index 9511bf615..c89ef1cc7 100644
--- a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
+++ b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
@@ -627,6 +627,11 @@ SOURCE=..\..\..\..\..\src\xercesc\util\KeyRefPair.hpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\..\..\src\xercesc\util\KeyValuePair.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\..\..\src\xercesc\util\KeyValuePair.hpp
 # End Source File
 # Begin Source File
@@ -3407,5 +3412,33 @@ SOURCE=..\..\..\..\..\src\xercesc\dom\DOMXPathResult.hpp
 SOURCE=..\..\..\..\..\src\xercesc\dom\StDOMNode.hpp
 # End Source File
 # End Group
+# Begin Group "xinclude"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\xinclude\XIncludeDOMDocumentProcessor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\xinclude\XIncludeDOMDocumentProcessor.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\xinclude\XIncludeLocation.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\xinclude\XIncludeLocation.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\xinclude\XIncludeUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\xinclude\XIncludeUtils.hpp
+# End Source File
+# End Group
 # End Target
 # End Project
diff --git a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
index 62b56385e..53b4cf811 100644
--- a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
+++ b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
@@ -27,6 +27,10 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "XercesLib - Win32 Release"
 
 OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -103,6 +107,8 @@ CLEAN :
 	-@erase "$(INTDIR)\DOMImplementationRegistry.obj"
 	-@erase "$(INTDIR)\DOMLocatorImpl.obj"
 	-@erase "$(INTDIR)\DOMLSException.obj"
+	-@erase "$(INTDIR)\DOMLSInputImpl.obj"
+	-@erase "$(INTDIR)\DOMLSOutputImpl.obj"
 	-@erase "$(INTDIR)\DOMLSParserImpl.obj"
 	-@erase "$(INTDIR)\DOMLSSerializerImpl.obj"
 	-@erase "$(INTDIR)\DOMNamedNodeMapImpl.obj"
@@ -123,6 +129,9 @@ CLEAN :
 	-@erase "$(INTDIR)\DOMTreeWalkerImpl.obj"
 	-@erase "$(INTDIR)\DOMTypeInfoImpl.obj"
 	-@erase "$(INTDIR)\DOMXPathException.obj"
+	-@erase "$(INTDIR)\DOMXPathExpressionImpl.obj"
+	-@erase "$(INTDIR)\DOMXPathNSResolverImpl.obj"
+	-@erase "$(INTDIR)\DOMXPathResultImpl.obj"
 	-@erase "$(INTDIR)\DoubleDatatypeValidator.obj"
 	-@erase "$(INTDIR)\DTDAttDef.obj"
 	-@erase "$(INTDIR)\DTDAttDefList.obj"
@@ -186,6 +195,7 @@ CLEAN :
 	-@erase "$(INTDIR)\PSVIAttributeList.obj"
 	-@erase "$(INTDIR)\PSVIElement.obj"
 	-@erase "$(INTDIR)\PSVIItem.obj"
+	-@erase "$(INTDIR)\PSVIUni.obj"
 	-@erase "$(INTDIR)\QName.obj"
 	-@erase "$(INTDIR)\QNameDatatypeValidator.obj"
 	-@erase "$(INTDIR)\RangeFactory.obj"
@@ -247,6 +257,9 @@ CLEAN :
 	-@erase "$(INTDIR)\XercesElementWildcard.obj"
 	-@erase "$(INTDIR)\XercesGroupInfo.obj"
 	-@erase "$(INTDIR)\XercesXPath.obj"
+	-@erase "$(INTDIR)\XIncludeDOMDocumentProcessor.obj"
+	-@erase "$(INTDIR)\XIncludeLocation.obj"
+	-@erase "$(INTDIR)\XIncludeUtils.obj"
 	-@erase "$(INTDIR)\XMemory.obj"
 	-@erase "$(INTDIR)\XML256TableTranscoder.obj"
 	-@erase "$(INTDIR)\XML88591Transcoder.obj"
@@ -348,42 +361,8 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "XERCES_USE_FILEMGR_WINDOWS" /D "XERCES_USE_MUTEXMGR_WINDOWS" /D "XERCES_USE_ATOMICOPMGR_WINDOWS" /D "XERCES_USE_NETACCESSOR_WINSOCK" /D "XERCES_USE_WIN32_MSGLOADER" /D "XERCES_USE_TRANSCODER_WINDOWS" /D "XERCES_PATH_DELIMITER_BACKSLASH" /D "XERCES_BUILDING_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "HAVE_FTIME" /D "HAVE_LIMITS_H" /D "HAVE_SYS_TIMEB_H" /D "HAVE_STRICMP" /D "HAVE_STRNICMP" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "XERCES_USE_FILEMGR_WINDOWS" /D "XERCES_USE_MUTEXMGR_WINDOWS" /D "XERCES_USE_ATOMICOPMGR_WINDOWS" /D "XERCES_USE_NETACCESSOR_WINSOCK" /D "XERCES_USE_WIN32_MSGLOADER" /D "XERCES_USE_TRANSCODER_WINDOWS" /D "XERCES_PATH_DELIMITER_BACKSLASH" /D "XERCES_BUILDING_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "HAVE_FTIME" /D "HAVE_LIMITS_H" /D "HAVE_SYS_TIMEB_H" /D "HAVE_STRICMP" /D "HAVE_STRNICMP" /D "HAVE_WCSUPR" /D "HAVE_WCSLWR" /D "HAVE_WCSNICMP" /D "HAVE_WCSICMP" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 MTL_PROJ=/D "NDEBUG" /mktyplib203 /o "NUL" /win32 
-RSC=rc.exe
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "NDEBUG" 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc" 
@@ -439,6 +418,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\Mutexes.obj" \
 	"$(INTDIR)\PanicHandler.obj" \
 	"$(INTDIR)\PlatformUtils.obj" \
+	"$(INTDIR)\PSVIUni.obj" \
 	"$(INTDIR)\QName.obj" \
 	"$(INTDIR)\StringPool.obj" \
 	"$(INTDIR)\SynchronizedStringPool.obj" \
@@ -665,6 +645,8 @@ LINK32_OBJS= \
 	"$(INTDIR)\DOMImplementationListImpl.obj" \
 	"$(INTDIR)\DOMImplementationRegistry.obj" \
 	"$(INTDIR)\DOMLocatorImpl.obj" \
+	"$(INTDIR)\DOMLSInputImpl.obj" \
+	"$(INTDIR)\DOMLSOutputImpl.obj" \
 	"$(INTDIR)\DOMLSSerializerImpl.obj" \
 	"$(INTDIR)\DOMNamedNodeMapImpl.obj" \
 	"$(INTDIR)\DOMNodeIDMap.obj" \
@@ -682,12 +664,18 @@ LINK32_OBJS= \
 	"$(INTDIR)\DOMTextImpl.obj" \
 	"$(INTDIR)\DOMTreeWalkerImpl.obj" \
 	"$(INTDIR)\DOMTypeInfoImpl.obj" \
+	"$(INTDIR)\DOMXPathExpressionImpl.obj" \
+	"$(INTDIR)\DOMXPathNSResolverImpl.obj" \
+	"$(INTDIR)\DOMXPathResultImpl.obj" \
 	"$(INTDIR)\XSDElementNSImpl.obj" \
 	"$(INTDIR)\DOMException.obj" \
 	"$(INTDIR)\DOMLSException.obj" \
 	"$(INTDIR)\DOMRangeException.obj" \
 	"$(INTDIR)\DOMXPathException.obj" \
-	"$(INTDIR)\Version.res"
+	"$(INTDIR)\Version.res" \
+	"$(INTDIR)\XIncludeDOMDocumentProcessor.obj" \
+	"$(INTDIR)\XIncludeLocation.obj" \
+	"$(INTDIR)\XIncludeUtils.obj"
 
 "$(OUTDIR)\xerces-c_3_0.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -770,6 +758,8 @@ CLEAN :
 	-@erase "$(INTDIR)\DOMImplementationRegistry.obj"
 	-@erase "$(INTDIR)\DOMLocatorImpl.obj"
 	-@erase "$(INTDIR)\DOMLSException.obj"
+	-@erase "$(INTDIR)\DOMLSInputImpl.obj"
+	-@erase "$(INTDIR)\DOMLSOutputImpl.obj"
 	-@erase "$(INTDIR)\DOMLSParserImpl.obj"
 	-@erase "$(INTDIR)\DOMLSSerializerImpl.obj"
 	-@erase "$(INTDIR)\DOMNamedNodeMapImpl.obj"
@@ -790,6 +780,9 @@ CLEAN :
 	-@erase "$(INTDIR)\DOMTreeWalkerImpl.obj"
 	-@erase "$(INTDIR)\DOMTypeInfoImpl.obj"
 	-@erase "$(INTDIR)\DOMXPathException.obj"
+	-@erase "$(INTDIR)\DOMXPathExpressionImpl.obj"
+	-@erase "$(INTDIR)\DOMXPathNSResolverImpl.obj"
+	-@erase "$(INTDIR)\DOMXPathResultImpl.obj"
 	-@erase "$(INTDIR)\DoubleDatatypeValidator.obj"
 	-@erase "$(INTDIR)\DTDAttDef.obj"
 	-@erase "$(INTDIR)\DTDAttDefList.obj"
@@ -853,6 +846,7 @@ CLEAN :
 	-@erase "$(INTDIR)\PSVIAttributeList.obj"
 	-@erase "$(INTDIR)\PSVIElement.obj"
 	-@erase "$(INTDIR)\PSVIItem.obj"
+	-@erase "$(INTDIR)\PSVIUni.obj"
 	-@erase "$(INTDIR)\QName.obj"
 	-@erase "$(INTDIR)\QNameDatatypeValidator.obj"
 	-@erase "$(INTDIR)\RangeFactory.obj"
@@ -915,6 +909,9 @@ CLEAN :
 	-@erase "$(INTDIR)\XercesElementWildcard.obj"
 	-@erase "$(INTDIR)\XercesGroupInfo.obj"
 	-@erase "$(INTDIR)\XercesXPath.obj"
+	-@erase "$(INTDIR)\XIncludeDOMDocumentProcessor.obj"
+	-@erase "$(INTDIR)\XIncludeLocation.obj"
+	-@erase "$(INTDIR)\XIncludeUtils.obj"
 	-@erase "$(INTDIR)\XMemory.obj"
 	-@erase "$(INTDIR)\XML256TableTranscoder.obj"
 	-@erase "$(INTDIR)\XML88591Transcoder.obj"
@@ -1016,42 +1013,8 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CRTDBG_MAP_ALLOC" /D "XERCES_USE_FILEMGR_WINDOWS" /D "XERCES_USE_MUTEXMGR_WINDOWS" /D "XERCES_USE_ATOMICOPMGR_WINDOWS" /D "XERCES_USE_NETACCESSOR_WINSOCK" /D "XERCES_USE_WIN32_MSGLOADER" /D "XERCES_USE_TRANSCODER_WINDOWS" /D "XERCES_PATH_DELIMITER_BACKSLASH" /D "XERCES_BUILDING_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "HAVE_FTIME" /D "HAVE_LIMITS_H" /D "HAVE_SYS_TIMEB_H" /D "HAVE_STRICMP" /D "HAVE_STRNICMP" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CRTDBG_MAP_ALLOC" /D "XERCES_USE_FILEMGR_WINDOWS" /D "XERCES_USE_MUTEXMGR_WINDOWS" /D "XERCES_USE_ATOMICOPMGR_WINDOWS" /D "XERCES_USE_NETACCESSOR_WINSOCK" /D "XERCES_USE_WIN32_MSGLOADER" /D "XERCES_USE_TRANSCODER_WINDOWS" /D "XERCES_PATH_DELIMITER_BACKSLASH" /D "XERCES_BUILDING_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "HAVE_FTIME" /D "HAVE_LIMITS_H" /D "HAVE_SYS_TIMEB_H" /D "HAVE_STRICMP" /D "HAVE_STRNICMP" /D "HAVE_WCSUPR" /D "HAVE_WCSLWR" /D "HAVE_WCSNICMP" /D "HAVE_WCSICMP" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 MTL_PROJ=/D "_DEBUG" /mktyplib203 /o "NUL" /win32 
-RSC=rc.exe
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "_DEBUG" 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc" 
@@ -1107,6 +1070,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\Mutexes.obj" \
 	"$(INTDIR)\PanicHandler.obj" \
 	"$(INTDIR)\PlatformUtils.obj" \
+	"$(INTDIR)\PSVIUni.obj" \
 	"$(INTDIR)\QName.obj" \
 	"$(INTDIR)\StringPool.obj" \
 	"$(INTDIR)\SynchronizedStringPool.obj" \
@@ -1333,6 +1297,8 @@ LINK32_OBJS= \
 	"$(INTDIR)\DOMImplementationListImpl.obj" \
 	"$(INTDIR)\DOMImplementationRegistry.obj" \
 	"$(INTDIR)\DOMLocatorImpl.obj" \
+	"$(INTDIR)\DOMLSInputImpl.obj" \
+	"$(INTDIR)\DOMLSOutputImpl.obj" \
 	"$(INTDIR)\DOMLSSerializerImpl.obj" \
 	"$(INTDIR)\DOMNamedNodeMapImpl.obj" \
 	"$(INTDIR)\DOMNodeIDMap.obj" \
@@ -1350,12 +1316,18 @@ LINK32_OBJS= \
 	"$(INTDIR)\DOMTextImpl.obj" \
 	"$(INTDIR)\DOMTreeWalkerImpl.obj" \
 	"$(INTDIR)\DOMTypeInfoImpl.obj" \
+	"$(INTDIR)\DOMXPathExpressionImpl.obj" \
+	"$(INTDIR)\DOMXPathNSResolverImpl.obj" \
+	"$(INTDIR)\DOMXPathResultImpl.obj" \
 	"$(INTDIR)\XSDElementNSImpl.obj" \
 	"$(INTDIR)\DOMException.obj" \
 	"$(INTDIR)\DOMLSException.obj" \
 	"$(INTDIR)\DOMRangeException.obj" \
 	"$(INTDIR)\DOMXPathException.obj" \
-	"$(INTDIR)\Version.res"
+	"$(INTDIR)\Version.res" \
+	"$(INTDIR)\XIncludeDOMDocumentProcessor.obj" \
+	"$(INTDIR)\XIncludeLocation.obj" \
+	"$(INTDIR)\XIncludeUtils.obj"
 
 "$(OUTDIR)\xerces-c_3_0D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -1438,6 +1410,8 @@ CLEAN :
 	-@erase "$(INTDIR)\DOMImplementationRegistry.obj"
 	-@erase "$(INTDIR)\DOMLocatorImpl.obj"
 	-@erase "$(INTDIR)\DOMLSException.obj"
+	-@erase "$(INTDIR)\DOMLSInputImpl.obj"
+	-@erase "$(INTDIR)\DOMLSOutputImpl.obj"
 	-@erase "$(INTDIR)\DOMLSParserImpl.obj"
 	-@erase "$(INTDIR)\DOMLSSerializerImpl.obj"
 	-@erase "$(INTDIR)\DOMNamedNodeMapImpl.obj"
@@ -1458,6 +1432,9 @@ CLEAN :
 	-@erase "$(INTDIR)\DOMTreeWalkerImpl.obj"
 	-@erase "$(INTDIR)\DOMTypeInfoImpl.obj"
 	-@erase "$(INTDIR)\DOMXPathException.obj"
+	-@erase "$(INTDIR)\DOMXPathExpressionImpl.obj"
+	-@erase "$(INTDIR)\DOMXPathNSResolverImpl.obj"
+	-@erase "$(INTDIR)\DOMXPathResultImpl.obj"
 	-@erase "$(INTDIR)\DoubleDatatypeValidator.obj"
 	-@erase "$(INTDIR)\DTDAttDef.obj"
 	-@erase "$(INTDIR)\DTDAttDefList.obj"
@@ -1521,6 +1498,7 @@ CLEAN :
 	-@erase "$(INTDIR)\PSVIAttributeList.obj"
 	-@erase "$(INTDIR)\PSVIElement.obj"
 	-@erase "$(INTDIR)\PSVIItem.obj"
+	-@erase "$(INTDIR)\PSVIUni.obj"
 	-@erase "$(INTDIR)\QName.obj"
 	-@erase "$(INTDIR)\QNameDatatypeValidator.obj"
 	-@erase "$(INTDIR)\RangeFactory.obj"
@@ -1583,6 +1561,9 @@ CLEAN :
 	-@erase "$(INTDIR)\XercesElementWildcard.obj"
 	-@erase "$(INTDIR)\XercesGroupInfo.obj"
 	-@erase "$(INTDIR)\XercesXPath.obj"
+	-@erase "$(INTDIR)\XIncludeDOMDocumentProcessor.obj"
+	-@erase "$(INTDIR)\XIncludeLocation.obj"
+	-@erase "$(INTDIR)\XIncludeUtils.obj"
 	-@erase "$(INTDIR)\XMemory.obj"
 	-@erase "$(INTDIR)\XML256TableTranscoder.obj"
 	-@erase "$(INTDIR)\XML88591Transcoder.obj"
@@ -1685,42 +1666,8 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CRTDBG_MAP_ALLOC" /D "XERCES_USE_FILEMGR_WINDOWS" /D "XERCES_USE_MUTEXMGR_WINDOWS" /D "XERCES_USE_ATOMICOPMGR_WINDOWS" /D "XERCES_USE_NETACCESSOR_WINSOCK" /D "XERCES_USE_WIN32_MSGLOADER" /D "XERCES_USE_TRANSCODER_WINDOWS" /D "XERCES_PATH_DELIMITER_BACKSLASH" /D "XERCES_BUILDING_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "HAVE_FTIME" /D "HAVE_LIMITS_H" /D "HAVE_SYS_TIMEB_H" /D "HAVE_STRICMP" /D "HAVE_STRNICMP" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CRTDBG_MAP_ALLOC" /D "XERCES_USE_FILEMGR_WINDOWS" /D "XERCES_USE_MUTEXMGR_WINDOWS" /D "XERCES_USE_ATOMICOPMGR_WINDOWS" /D "XERCES_USE_NETACCESSOR_WINSOCK" /D "XERCES_USE_WIN32_MSGLOADER" /D "XERCES_USE_TRANSCODER_WINDOWS" /D "XERCES_PATH_DELIMITER_BACKSLASH" /D "XERCES_BUILDING_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "HAVE_FTIME" /D "HAVE_LIMITS_H" /D "HAVE_SYS_TIMEB_H" /D "HAVE_STRICMP" /D "HAVE_STRNICMP" /D "HAVE_WCSUPR" /D "HAVE_WCSLWR" /D "HAVE_WCSNICMP" /D "HAVE_WCSICMP" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 MTL_PROJ=/D "_DEBUG" /mktyplib203 /o "NUL" /win32 
-RSC=rc.exe
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "_DEBUG" 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc" 
@@ -1776,6 +1723,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\Mutexes.obj" \
 	"$(INTDIR)\PanicHandler.obj" \
 	"$(INTDIR)\PlatformUtils.obj" \
+	"$(INTDIR)\PSVIUni.obj" \
 	"$(INTDIR)\QName.obj" \
 	"$(INTDIR)\StringPool.obj" \
 	"$(INTDIR)\SynchronizedStringPool.obj" \
@@ -2002,6 +1950,8 @@ LINK32_OBJS= \
 	"$(INTDIR)\DOMImplementationListImpl.obj" \
 	"$(INTDIR)\DOMImplementationRegistry.obj" \
 	"$(INTDIR)\DOMLocatorImpl.obj" \
+	"$(INTDIR)\DOMLSInputImpl.obj" \
+	"$(INTDIR)\DOMLSOutputImpl.obj" \
 	"$(INTDIR)\DOMLSSerializerImpl.obj" \
 	"$(INTDIR)\DOMNamedNodeMapImpl.obj" \
 	"$(INTDIR)\DOMNodeIDMap.obj" \
@@ -2019,12 +1969,18 @@ LINK32_OBJS= \
 	"$(INTDIR)\DOMTextImpl.obj" \
 	"$(INTDIR)\DOMTreeWalkerImpl.obj" \
 	"$(INTDIR)\DOMTypeInfoImpl.obj" \
+	"$(INTDIR)\DOMXPathExpressionImpl.obj" \
+	"$(INTDIR)\DOMXPathNSResolverImpl.obj" \
+	"$(INTDIR)\DOMXPathResultImpl.obj" \
 	"$(INTDIR)\XSDElementNSImpl.obj" \
 	"$(INTDIR)\DOMException.obj" \
 	"$(INTDIR)\DOMLSException.obj" \
 	"$(INTDIR)\DOMRangeException.obj" \
 	"$(INTDIR)\DOMXPathException.obj" \
-	"$(INTDIR)\Version.res"
+	"$(INTDIR)\Version.res" \
+	"$(INTDIR)\XIncludeDOMDocumentProcessor.obj" \
+	"$(INTDIR)\XIncludeLocation.obj" \
+	"$(INTDIR)\XIncludeUtils.obj"
 
 "$(OUTDIR)\xerces-c_3_0D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -2107,6 +2063,8 @@ CLEAN :
 	-@erase "$(INTDIR)\DOMImplementationRegistry.obj"
 	-@erase "$(INTDIR)\DOMLocatorImpl.obj"
 	-@erase "$(INTDIR)\DOMLSException.obj"
+	-@erase "$(INTDIR)\DOMLSInputImpl.obj"
+	-@erase "$(INTDIR)\DOMLSOutputImpl.obj"
 	-@erase "$(INTDIR)\DOMLSParserImpl.obj"
 	-@erase "$(INTDIR)\DOMLSSerializerImpl.obj"
 	-@erase "$(INTDIR)\DOMNamedNodeMapImpl.obj"
@@ -2127,6 +2085,9 @@ CLEAN :
 	-@erase "$(INTDIR)\DOMTreeWalkerImpl.obj"
 	-@erase "$(INTDIR)\DOMTypeInfoImpl.obj"
 	-@erase "$(INTDIR)\DOMXPathException.obj"
+	-@erase "$(INTDIR)\DOMXPathExpressionImpl.obj"
+	-@erase "$(INTDIR)\DOMXPathNSResolverImpl.obj"
+	-@erase "$(INTDIR)\DOMXPathResultImpl.obj"
 	-@erase "$(INTDIR)\DoubleDatatypeValidator.obj"
 	-@erase "$(INTDIR)\DTDAttDef.obj"
 	-@erase "$(INTDIR)\DTDAttDefList.obj"
@@ -2190,6 +2151,7 @@ CLEAN :
 	-@erase "$(INTDIR)\PSVIAttributeList.obj"
 	-@erase "$(INTDIR)\PSVIElement.obj"
 	-@erase "$(INTDIR)\PSVIItem.obj"
+	-@erase "$(INTDIR)\PSVIUni.obj"
 	-@erase "$(INTDIR)\QName.obj"
 	-@erase "$(INTDIR)\QNameDatatypeValidator.obj"
 	-@erase "$(INTDIR)\RangeFactory.obj"
@@ -2251,6 +2213,9 @@ CLEAN :
 	-@erase "$(INTDIR)\XercesElementWildcard.obj"
 	-@erase "$(INTDIR)\XercesGroupInfo.obj"
 	-@erase "$(INTDIR)\XercesXPath.obj"
+	-@erase "$(INTDIR)\XIncludeDOMDocumentProcessor.obj"
+	-@erase "$(INTDIR)\XIncludeLocation.obj"
+	-@erase "$(INTDIR)\XIncludeUtils.obj"
 	-@erase "$(INTDIR)\XMemory.obj"
 	-@erase "$(INTDIR)\XML256TableTranscoder.obj"
 	-@erase "$(INTDIR)\XML88591Transcoder.obj"
@@ -2353,42 +2318,8 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "XERCES_USE_FILEMGR_WINDOWS" /D "XERCES_USE_MUTEXMGR_WINDOWS" /D "XERCES_USE_ATOMICOPMGR_WINDOWS" /D "XERCES_USE_NETACCESSOR_WINSOCK" /D "XERCES_USE_WIN32_MSGLOADER" /D "XERCES_USE_TRANSCODER_WINDOWS" /D "XERCES_PATH_DELIMITER_BACKSLASH" /D "XERCES_BUILDING_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "HAVE_FTIME" /D "HAVE_LIMITS_H" /D "HAVE_SYS_TIMEB_H" /D "HAVE_STRICMP" /D "HAVE_STRNICMP" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "XERCES_USE_FILEMGR_WINDOWS" /D "XERCES_USE_MUTEXMGR_WINDOWS" /D "XERCES_USE_ATOMICOPMGR_WINDOWS" /D "XERCES_USE_NETACCESSOR_WINSOCK" /D "XERCES_USE_WIN32_MSGLOADER" /D "XERCES_USE_TRANSCODER_WINDOWS" /D "XERCES_PATH_DELIMITER_BACKSLASH" /D "XERCES_BUILDING_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "HAVE_FTIME" /D "HAVE_LIMITS_H" /D "HAVE_SYS_TIMEB_H" /D "HAVE_STRICMP" /D "HAVE_STRNICMP" /D "HAVE_WCSUPR" /D "HAVE_WCSLWR" /D "HAVE_WCSNICMP" /D "HAVE_WCSICMP" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 MTL_PROJ=/D "NDEBUG" /mktyplib203 /o "NUL" /win32 
-RSC=rc.exe
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "NDEBUG" 
 BSC32=bscmake.exe
 BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc" 
@@ -2444,6 +2375,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\Mutexes.obj" \
 	"$(INTDIR)\PanicHandler.obj" \
 	"$(INTDIR)\PlatformUtils.obj" \
+	"$(INTDIR)\PSVIUni.obj" \
 	"$(INTDIR)\QName.obj" \
 	"$(INTDIR)\StringPool.obj" \
 	"$(INTDIR)\SynchronizedStringPool.obj" \
@@ -2670,6 +2602,8 @@ LINK32_OBJS= \
 	"$(INTDIR)\DOMImplementationListImpl.obj" \
 	"$(INTDIR)\DOMImplementationRegistry.obj" \
 	"$(INTDIR)\DOMLocatorImpl.obj" \
+	"$(INTDIR)\DOMLSInputImpl.obj" \
+	"$(INTDIR)\DOMLSOutputImpl.obj" \
 	"$(INTDIR)\DOMLSSerializerImpl.obj" \
 	"$(INTDIR)\DOMNamedNodeMapImpl.obj" \
 	"$(INTDIR)\DOMNodeIDMap.obj" \
@@ -2687,12 +2621,18 @@ LINK32_OBJS= \
 	"$(INTDIR)\DOMTextImpl.obj" \
 	"$(INTDIR)\DOMTreeWalkerImpl.obj" \
 	"$(INTDIR)\DOMTypeInfoImpl.obj" \
+	"$(INTDIR)\DOMXPathExpressionImpl.obj" \
+	"$(INTDIR)\DOMXPathNSResolverImpl.obj" \
+	"$(INTDIR)\DOMXPathResultImpl.obj" \
 	"$(INTDIR)\XSDElementNSImpl.obj" \
 	"$(INTDIR)\DOMException.obj" \
 	"$(INTDIR)\DOMLSException.obj" \
 	"$(INTDIR)\DOMRangeException.obj" \
 	"$(INTDIR)\DOMXPathException.obj" \
-	"$(INTDIR)\Version.res"
+	"$(INTDIR)\Version.res" \
+	"$(INTDIR)\XIncludeDOMDocumentProcessor.obj" \
+	"$(INTDIR)\XIncludeLocation.obj" \
+	"$(INTDIR)\XIncludeUtils.obj"
 
 "$(OUTDIR)\xerces-c_3_0.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -2701,6 +2641,36 @@ LINK32_OBJS= \
 
 !ENDIF 
 
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("XercesLib.dep")
@@ -3006,6 +2976,7 @@ SOURCE=..\..\..\..\..\src\xercesc\util\HexBin.cpp
 
 SOURCE=..\..\..\..\..\src\xercesc\util\Janitor.c
 SOURCE=..\..\..\..\..\src\xercesc\util\KeyRefPair.c
+SOURCE=..\..\..\..\..\src\xercesc\util\KeyValuePair.c
 SOURCE=..\..\..\..\..\src\xercesc\util\KVStringPair.cpp
 
 "$(INTDIR)\KVStringPair.obj" : $(SOURCE) "$(INTDIR)"
@@ -3031,6 +3002,12 @@ SOURCE=..\..\..\..\..\src\xercesc\util\PlatformUtils.cpp
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=..\..\..\..\..\src\xercesc\util\PSVIUni.cpp
+
+"$(INTDIR)\PSVIUni.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 SOURCE=..\..\..\..\..\src\xercesc\util\QName.cpp
 
 "$(INTDIR)\QName.obj" : $(SOURCE) "$(INTDIR)"
@@ -4464,6 +4441,18 @@ SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMLocatorImpl.cpp
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMLSInputImpl.cpp
+
+"$(INTDIR)\DOMLSInputImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMLSOutputImpl.cpp
+
+"$(INTDIR)\DOMLSOutputImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMLSSerializerImpl.cpp
 
 "$(INTDIR)\DOMLSSerializerImpl.obj" : $(SOURCE) "$(INTDIR)"
@@ -4566,6 +4555,24 @@ SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMTypeInfoImpl.cpp
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMXPathExpressionImpl.cpp
+
+"$(INTDIR)\DOMXPathExpressionImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMXPathNSResolverImpl.cpp
+
+"$(INTDIR)\DOMXPathNSResolverImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMXPathResultImpl.cpp
+
+"$(INTDIR)\DOMXPathResultImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 SOURCE=..\..\..\..\..\src\xercesc\dom\impl\XSDElementNSImpl.cpp
 
 "$(INTDIR)\XSDElementNSImpl.obj" : $(SOURCE) "$(INTDIR)"
@@ -4596,6 +4603,24 @@ SOURCE=..\..\..\..\..\src\xercesc\dom\DOMXPathException.cpp
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=..\..\..\..\..\src\xercesc\xinclude\XIncludeDOMDocumentProcessor.cpp
+
+"$(INTDIR)\XIncludeDOMDocumentProcessor.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\..\..\src\xercesc\xinclude\XIncludeLocation.cpp
+
+"$(INTDIR)\XIncludeLocation.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\..\..\src\xercesc\xinclude\XIncludeUtils.cpp
+
+"$(INTDIR)\XIncludeUtils.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 
 !ENDIF 
 
diff --git a/Projects/Win32/VC6/xerces-all/all/all.mak b/Projects/Win32/VC6/xerces-all/all/all.mak
index 845f8f803..d8599ee88 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 : "XSValueTest - Win64 Release" "XercesDeprecatedDOMLib - Win64 Release" "SCMPrint - Win64 Release" "PSVIWriter - Win64 Release" "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" 
+ALL : "XInclude - Win32 Release" "XSTSHarness - Win32 Release" "XSValueTest - Win32 Release" "SCMPrint - Win32 Release" "PSVIWriter - Win32 Release" "DOMNormalizerTest - Win32 Release" "DOMTypeInfoTest - Win32 Release" "DOMTraversalTest - Win32 Release" "XercesLib - Win32 Release" "MemHandlerTest - Win32 Release" "XSerializerTest - Win32 Release" "ThreadTest - Win32 Release" "StdInParse - Win32 Release" "SEnumVal - Win32 Release" "SAXPrint - Win32 Release" "SAXCount - Win32 Release" "SAX2Print - Win32 Release" "SAX2Count - Win32 Release" "Redirect - Win32 Release" "RangeTest - Win32 Release" "PParse - Win32 Release" "MemParse - Win32 Release" "InitTermTest - Win32 Release" "EnumVal - Win32 Release" "EncodingTest - Win32 Release" "DOMTest - Win32 Release" "DOMPrint - Win32 Release" "DOMMemTest - Win32 Release" "DOMCount - Win32 Release" "CreateDOMDocument - Win32 Release" 
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"CreateDOMDocument - Win64 ReleaseCLEAN" "DOMCount - Win64 ReleaseCLEAN" "DOMMemTest - Win64 ReleaseCLEAN" "DOMPrint - Win64 ReleaseCLEAN" "DOMTest - Win64 ReleaseCLEAN" "EncodingTest - Win64 ReleaseCLEAN" "EnumVal - Win64 ReleaseCLEAN" "InitTermTest - Win64 ReleaseCLEAN" "MemParse - Win64 ReleaseCLEAN" "PParse - Win64 ReleaseCLEAN" "RangeTest - Win64 ReleaseCLEAN" "Redirect - Win64 ReleaseCLEAN" "SAX2Count - Win64 ReleaseCLEAN" "SAX2Print - Win64 ReleaseCLEAN" "SAXCount - Win64 ReleaseCLEAN" "SAXPrint - Win64 ReleaseCLEAN" "SEnumVal - Win64 ReleaseCLEAN" "StdInParse - Win64 ReleaseCLEAN" "ThreadTest - Win64 ReleaseCLEAN" "XSerializerTest - Win64 ReleaseCLEAN" "MemHandlerTest - Win64 ReleaseCLEAN" "XercesLib - Win64 ReleaseCLEAN" "DOMTraversalTest - Win64 ReleaseCLEAN" "DeprecatedDOMCount - Win64 ReleaseCLEAN" "DOMTypeInfoTest - Win64 ReleaseCLEAN" "DOMNormalizerTest - Win64 ReleaseCLEAN" "PSVIWriter - Win64 ReleaseCLEAN" "SCMPrint - Win64 ReleaseCLEAN" "XercesDeprecatedDOMLib - Win64 ReleaseCLEAN" "XSValueTest - Win64 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" "DOMTypeInfoTest - Win32 ReleaseCLEAN" "DOMNormalizerTest - Win32 ReleaseCLEAN" "PSVIWriter - Win32 ReleaseCLEAN" "SCMPrint - Win32 ReleaseCLEAN" "XSValueTest - Win32 ReleaseCLEAN" "XSTSHarness - Win32 ReleaseCLEAN" "XInclude - Win32 ReleaseCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -50,28 +50,19 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-!IF  "$(CFG)" == "all - Win32 Release"
-
 MTL=midl.exe
-MTL_PROJ=
 
-!ELSEIF  "$(CFG)" == "all - Win32 Debug"
+!IF  "$(CFG)" == "all - Win32 Release"
 
-MTL=midl.exe
-MTL_PROJ=
+!ELSEIF  "$(CFG)" == "all - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "all - Win64 Debug"
 
-MTL=midl.exe
-MTL_PROJ=
-
 !ELSEIF  "$(CFG)" == "all - Win64 Release"
 
-MTL=midl.exe
-MTL_PROJ=
-
 !ENDIF 
 
+MTL_PROJ=
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("all.dep")
@@ -1236,56 +1227,6 @@ 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" 
@@ -1486,100 +1427,130 @@ MTL_PROJ=
 
 !IF  "$(CFG)" == "all - Win32 Release"
 
-"XercesDeprecatedDOMLib - Win32 Release" : 
-   cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win32 Release" 
+"XSValueTest - Win32 Release" : 
+   cd "..\XSValueTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSValueTest.mak" CFG="XSValueTest - Win32 Release" 
    cd "..\all"
 
-"XercesDeprecatedDOMLib - Win32 ReleaseCLEAN" : 
-   cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win32 Release" RECURSE=1 CLEAN 
+"XSValueTest - Win32 ReleaseCLEAN" : 
+   cd "..\XSValueTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSValueTest.mak" CFG="XSValueTest - Win32 Release" RECURSE=1 CLEAN 
    cd "..\all"
 
 !ELSEIF  "$(CFG)" == "all - Win32 Debug"
 
-"XercesDeprecatedDOMLib - Win32 Debug" : 
-   cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win32 Debug" 
+"XSValueTest - Win32 Debug" : 
+   cd "..\XSValueTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSValueTest.mak" CFG="XSValueTest - Win32 Debug" 
    cd "..\all"
 
-"XercesDeprecatedDOMLib - Win32 DebugCLEAN" : 
-   cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win32 Debug" RECURSE=1 CLEAN 
+"XSValueTest - Win32 DebugCLEAN" : 
+   cd "..\XSValueTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSValueTest.mak" CFG="XSValueTest - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\all"
 
 !ELSEIF  "$(CFG)" == "all - Win64 Debug"
 
-"XercesDeprecatedDOMLib - Win64 Debug" : 
-   cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win64 Debug" 
+"XSValueTest - Win64 Debug" : 
+   cd "..\XSValueTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSValueTest.mak" CFG="XSValueTest - Win64 Debug" 
    cd "..\all"
 
-"XercesDeprecatedDOMLib - Win64 DebugCLEAN" : 
-   cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win64 Debug" RECURSE=1 CLEAN 
+"XSValueTest - Win64 DebugCLEAN" : 
+   cd "..\XSValueTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSValueTest.mak" CFG="XSValueTest - Win64 Debug" RECURSE=1 CLEAN 
    cd "..\all"
 
 !ELSEIF  "$(CFG)" == "all - Win64 Release"
 
-"XercesDeprecatedDOMLib - Win64 Release" : 
-   cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win64 Release" 
+"XSValueTest - Win64 Release" : 
+   cd "..\XSValueTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSValueTest.mak" CFG="XSValueTest - Win64 Release" 
    cd "..\all"
 
-"XercesDeprecatedDOMLib - Win64 ReleaseCLEAN" : 
-   cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win64 Release" RECURSE=1 CLEAN 
+"XSValueTest - Win64 ReleaseCLEAN" : 
+   cd "..\XSValueTest"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSValueTest.mak" CFG="XSValueTest - Win64 Release" RECURSE=1 CLEAN 
    cd "..\all"
 
 !ENDIF 
 
 !IF  "$(CFG)" == "all - Win32 Release"
 
-"XSValueTest - Win32 Release" : 
-   cd "..\XSValueTest"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSValueTest.mak" CFG="XSValueTest - Win32 Release" 
+"XSTSHarness - Win32 Release" : 
+   cd "..\XSTSHarness"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSTSHarness.mak" CFG="XSTSHarness - Win32 Release" 
    cd "..\all"
 
-"XSValueTest - Win32 ReleaseCLEAN" : 
-   cd "..\XSValueTest"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSValueTest.mak" CFG="XSValueTest - Win32 Release" RECURSE=1 CLEAN 
+"XSTSHarness - Win32 ReleaseCLEAN" : 
+   cd "..\XSTSHarness"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSTSHarness.mak" CFG="XSTSHarness - Win32 Release" RECURSE=1 CLEAN 
    cd "..\all"
 
 !ELSEIF  "$(CFG)" == "all - Win32 Debug"
 
-"XSValueTest - Win32 Debug" : 
-   cd "..\XSValueTest"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSValueTest.mak" CFG="XSValueTest - Win32 Debug" 
+"XSTSHarness - Win32 Debug" : 
+   cd "..\XSTSHarness"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSTSHarness.mak" CFG="XSTSHarness - Win32 Debug" 
    cd "..\all"
 
-"XSValueTest - Win32 DebugCLEAN" : 
-   cd "..\XSValueTest"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSValueTest.mak" CFG="XSValueTest - Win32 Debug" RECURSE=1 CLEAN 
+"XSTSHarness - Win32 DebugCLEAN" : 
+   cd "..\XSTSHarness"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSTSHarness.mak" CFG="XSTSHarness - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\all"
 
 !ELSEIF  "$(CFG)" == "all - Win64 Debug"
 
-"XSValueTest - Win64 Debug" : 
-   cd "..\XSValueTest"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSValueTest.mak" CFG="XSValueTest - Win64 Debug" 
+!ELSEIF  "$(CFG)" == "all - Win64 Release"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "all - Win32 Release"
+
+"XInclude - Win32 Release" : 
+   cd "..\XInclude"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XInclude.mak" CFG="XInclude - Win32 Release" 
    cd "..\all"
 
-"XSValueTest - Win64 DebugCLEAN" : 
-   cd "..\XSValueTest"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSValueTest.mak" CFG="XSValueTest - Win64 Debug" RECURSE=1 CLEAN 
+"XInclude - Win32 ReleaseCLEAN" : 
+   cd "..\XInclude"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XInclude.mak" CFG="XInclude - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\all"
+
+!ELSEIF  "$(CFG)" == "all - Win32 Debug"
+
+"XInclude - Win32 Debug" : 
+   cd "..\XInclude"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XInclude.mak" CFG="XInclude - Win32 Debug" 
+   cd "..\all"
+
+"XInclude - Win32 DebugCLEAN" : 
+   cd "..\XInclude"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XInclude.mak" CFG="XInclude - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\all"
+
+!ELSEIF  "$(CFG)" == "all - Win64 Debug"
+
+"XInclude - Win64 Debug" : 
+   cd "..\XInclude"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XInclude.mak" CFG="XInclude - Win64 Debug" 
+   cd "..\all"
+
+"XInclude - Win64 DebugCLEAN" : 
+   cd "..\XInclude"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XInclude.mak" CFG="XInclude - Win64 Debug" RECURSE=1 CLEAN 
    cd "..\all"
 
 !ELSEIF  "$(CFG)" == "all - Win64 Release"
 
-"XSValueTest - Win64 Release" : 
-   cd "..\XSValueTest"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSValueTest.mak" CFG="XSValueTest - Win64 Release" 
+"XInclude - Win64 Release" : 
+   cd "..\XInclude"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XInclude.mak" CFG="XInclude - Win64 Release" 
    cd "..\all"
 
-"XSValueTest - Win64 ReleaseCLEAN" : 
-   cd "..\XSValueTest"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XSValueTest.mak" CFG="XSValueTest - Win64 Release" RECURSE=1 CLEAN 
+"XInclude - Win64 ReleaseCLEAN" : 
+   cd "..\XInclude"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XInclude.mak" CFG="XInclude - Win64 Release" RECURSE=1 CLEAN 
    cd "..\all"
 
 !ENDIF 
diff --git a/Projects/Win32/VC6/xerces-all/xerces-all.dsw b/Projects/Win32/VC6/xerces-all/xerces-all.dsw
index 0e44ce7e2..52c4e0f1c 100644
--- a/Projects/Win32/VC6/xerces-all/xerces-all.dsw
+++ b/Projects/Win32/VC6/xerces-all/xerces-all.dsw
@@ -378,6 +378,21 @@ Package=<4>
 
 ###############################################################################
 
+Project: "XInclude"=".\XInclude\XInclude.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name XercesLib
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "XSTSHarness"=".\XSTSHarness\XSTSHarness.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -530,6 +545,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name XSTSHarness
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name XInclude
+    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.mak b/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.mak
index c1a5fe58d..6a81e812a 100644
--- a/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.mak
+++ b/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.mak
@@ -2,52 +2,56 @@
 !IF "$(CFG)" == ""
 CFG=xml4com - Win32 Debug
 !MESSAGE No configuration specified. Defaulting to xml4com - Win32 Debug.
-!ENDIF
+!ENDIF 
 
 !IF "$(CFG)" != "xml4com - Win32 Debug" && "$(CFG)" != "xml4com - Win32 Release MinDependency"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "xerces-com.mak" CFG="xml4com - Win32 Debug"
-!MESSAGE
+!MESSAGE 
 !MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE 
 !MESSAGE "xml4com - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "xml4com - Win32 Release MinDependency" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
+!MESSAGE 
 !ERROR An invalid configuration is specified.
-!ENDIF
+!ENDIF 
 
 !IF "$(OS)" == "Windows_NT"
 NULL=
-!ELSE
+!ELSE 
 NULL=nul
-!ENDIF
+!ENDIF 
+
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
 
 !IF  "$(CFG)" == "xml4com - Win32 Debug"
 
-OUTDIR=.\..\..\..\..\..\Build\Win32\xml4com\Debug
-INTDIR=.\..\..\..\..\..\Build\Win32\xml4com\Debug
+OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Debug
+INTDIR=.\..\..\..\..\..\Build\Win32\VC6\Debug\obj
 # Begin Custom Macros
-OutDir=.\..\..\..\..\..\Build\Win32\xml4com\Debug
+OutDir=.\..\..\..\..\..\Build\Win32\VC6\Debug
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0" 
 
-ALL : "$(OUTDIR)\xerces-com.dll" "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" "..\..\..\..\..\src\xercesc\com\xml4com.h" "..\..\..\..\..\src\xercesc\com\xml4com_i.c" ".\..\..\..\..\..\Build\Win32\xml4com\Debug\regsvr32.trg"
+ALL : "$(OUTDIR)\xerces-com.dll" ".\..\..\..\..\..\Build\Win32\VC6\Debug\regsvr32.trg"
 
-!ELSE
+!ELSE 
 
-ALL : "XercesLib - Win32 Debug" "$(OUTDIR)\xerces-com.dll" "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" "..\..\..\..\..\src\xercesc\com\xml4com.h" "..\..\..\..\..\src\xercesc\com\xml4com_i.c" ".\..\..\..\..\..\Build\Win32\xml4com\Debug\regsvr32.trg"
+ALL : "XercesLib - Win32 Debug" "$(OUTDIR)\xerces-com.dll" ".\..\..\..\..\..\Build\Win32\VC6\Debug\regsvr32.trg"
 
-!ENDIF
+!ENDIF 
 
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win32 DebugCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1" 
+CLEAN :"XercesLib - Win32 DebugCLEAN" 
+!ELSE 
 CLEAN :
-!ENDIF
+!ENDIF 
 	-@erase "$(INTDIR)\BindStatusCallback.obj"
 	-@erase "$(INTDIR)\StdAfx.obj"
 	-@erase "$(INTDIR)\vc60.idb"
@@ -77,54 +81,22 @@ CLEAN :
 	-@erase "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb"
 	-@erase "..\..\..\..\..\src\xercesc\com\xml4com.h"
 	-@erase "..\..\..\..\..\src\xercesc\com\xml4com_i.c"
-	-@erase ".\..\..\..\..\..\Build\Win32\xml4com\Debug\regsvr32.trg"
+	-@erase ".\..\..\..\..\..\Build\Win32\VC6\Debug\regsvr32.trg"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "_DEBUG" /D "_MBCS" /D "_ATL_DEBUG_INTERFACES" /D "_ATL_DEBUG_QI" /D "_ATL_DEBUG_REFCOUNT" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
+"$(INTDIR)" :
+    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-MTL=midl.exe
-MTL_PROJ=
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\xml4com.res" /d "_DEBUG"
+CPP_PROJ=/MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "_DEBUG" /D "_MBCS" /D "_ATL_DEBUG_INTERFACES" /D "_ATL_DEBUG_QI" /D "_ATL_DEBUG_REFCOUNT" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\xerces-com.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\xml4com.res" /d "_DEBUG" 
 BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\xerces-com.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\xerces-com.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_2D.lib /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-com.pdb" /debug /machine:I386 /def:"..\..\..\..\..\src\xercesc\com\xml4com.def" /out:"$(OUTDIR)\xerces-com.dll" /implib:"$(OUTDIR)\xerces-com.lib" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_3D.lib /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-com.pdb" /debug /machine:I386 /def:"..\..\..\..\..\src\xercesc\com\xml4com.def" /out:"$(OUTDIR)\xerces-com.dll" /implib:"$(OUTDIR)\xerces-com.lib" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 DEF_FILE= \
 	"..\..\..\..\..\src\xercesc\com\xml4com.def"
 LINK32_OBJS= \
@@ -146,52 +118,49 @@ LINK32_OBJS= \
 	"$(INTDIR)\XMLDOMXMLDecl.obj" \
 	"$(INTDIR)\XMLHTTPRequest.obj" \
 	"$(INTDIR)\xml4com.res" \
-	"..\..\..\..\..\Build\Win32\VC6\Debug\xerces-c_2D.lib"
+	"$(OUTDIR)\xerces-c_3D.lib"
 
 "$(OUTDIR)\xerces-com.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
-OutDir=.\..\..\..\..\..\Build\Win32\xml4com\Debug
-TargetDir=\Xerces-Testing\Build\Win32\xml4com\Debug
-TargetPath=\Xerces-Testing\Build\Win32\xml4com\Debug\xerces-com.dll
-InputPath=\Xerces-Testing\Build\Win32\xml4com\Debug\xerces-com.dll
+OutDir=.\..\..\..\..\..\Build\Win32\VC6\Debug
+TargetPath=\Xerces\Xerces-C\Build\Win32\VC6\Debug\xerces-com.dll
+InputPath=\Xerces\Xerces-C\Build\Win32\VC6\Debug\xerces-com.dll
 SOURCE="$(InputPath)"
 
 "$(OUTDIR)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat
-	@echo off
-	echo copy ..\..\..\..\..\Build\Win32\VC6\Debug\xerces-c_2_3_0D.dll "$(TargetDir)"
-	copy ..\..\..\..\..\Build\Win32\VC6\Debug\xerces-c_2_3_0D.dll "$(TargetDir)"
-	regsvr32 /s /c "$(TargetPath)"
-	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
-<<
+	<<tempfile.bat 
+	@echo off 
+	regsvr32 /s /c "$(TargetPath)" 
+	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
+<< 
 	
 
 !ELSEIF  "$(CFG)" == "xml4com - Win32 Release MinDependency"
 
-OUTDIR=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency
-INTDIR=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency
+OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
+INTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release\obj
 # Begin Custom Macros
-OutDir=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency
+OutDir=.\..\..\..\..\..\Build\Win32\VC6\Release
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0" 
 
-ALL : "$(OUTDIR)\xerces-com.dll" "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" "..\..\..\..\..\src\xercesc\com\xml4com.h" "..\..\..\..\..\src\xercesc\com\xml4com_i.c" ".\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency\regsvr32.trg" "\Xerces-Testing\Build\Win32\xml4com\ReleaseMinDependency\xerces-c_2_3_0.dll"
+ALL : "$(OUTDIR)\xerces-com.dll" "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" "..\..\..\..\..\src\xercesc\com\xml4com.h" "..\..\..\..\..\src\xercesc\com\xml4com_i.c" ".\..\..\..\..\..\Build\Win32\VC6\Release\regsvr32.trg"
 
-!ELSE
+!ELSE 
 
-ALL : "$(OUTDIR)\xerces-com.dll" "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" "..\..\..\..\..\src\xercesc\com\xml4com.h" "..\..\..\..\..\src\xercesc\com\xml4com_i.c" ".\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency\regsvr32.trg" "\Xerces-Testing\Build\Win32\xml4com\ReleaseMinDependency\xerces-c_2_3_0.dll"
+ALL : "$(OUTDIR)\xerces-com.dll" "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" "..\..\..\..\..\src\xercesc\com\xml4com.h" "..\..\..\..\..\src\xercesc\com\xml4com_i.c" ".\..\..\..\..\..\Build\Win32\VC6\Release\regsvr32.trg"
 
-!ENDIF
+!ENDIF 
 
-!IF "$(RECURSE)" == "1"
+!IF "$(RECURSE)" == "1" 
 CLEAN :
-!ELSE
+!ELSE 
 CLEAN :
-!ENDIF
+!ENDIF 
 	-@erase "$(INTDIR)\BindStatusCallback.obj"
 	-@erase "$(INTDIR)\StdAfx.obj"
 	-@erase "$(INTDIR)\vc60.idb"
@@ -218,55 +187,22 @@ CLEAN :
 	-@erase "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb"
 	-@erase "..\..\..\..\..\src\xercesc\com\xml4com.h"
 	-@erase "..\..\..\..\..\src\xercesc\com\xml4com_i.c"
-	-@erase ".\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency\regsvr32.trg"
-	-@erase "\Xerces-Testing\Build\Win32\xml4com\ReleaseMinDependency\xerces-c_2_3_0.dll"
+	-@erase ".\..\..\..\..\..\Build\Win32\VC6\Release\regsvr32.trg"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP=$(CPP)
-CPP_PROJ=/MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "NDEBUG" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+"$(INTDIR)" :
+    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
-MTL_PROJ=
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\xml4com.res" /d "NDEBUG"
+CPP_PROJ=/MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "NDEBUG" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\xerces-com.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\xml4com.res" /d "NDEBUG" 
 BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\xerces-com.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\xerces-com.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_2.lib /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xerces-com.pdb" /machine:I386 /def:"..\..\..\..\..\src\xercesc\com\xml4com.def" /out:"$(OUTDIR)\xerces-com.dll" /implib:"$(OUTDIR)\xerces-com.lib" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_3.lib /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xerces-com.pdb" /machine:I386 /def:"..\..\..\..\..\src\xercesc\com\xml4com.def" /out:"$(OUTDIR)\xerces-com.dll" /implib:"$(OUTDIR)\xerces-com.lib" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
 DEF_FILE= \
 	"..\..\..\..\..\src\xercesc\com\xml4com.def"
 LINK32_OBJS= \
@@ -294,38 +230,66 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
-OutDir=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency
-TargetDir=\Xerces-Testing\Build\Win32\xml4com\ReleaseMinDependency
-TargetPath=\Xerces-Testing\Build\Win32\xml4com\ReleaseMinDependency\xerces-com.dll
-InputPath=\Xerces-Testing\Build\Win32\xml4com\ReleaseMinDependency\xerces-com.dll
+OutDir=.\..\..\..\..\..\Build\Win32\VC6\Release
+TargetPath=\Xerces\Xerces-C\Build\Win32\VC6\Release\xerces-com.dll
+InputPath=\Xerces\Xerces-C\Build\Win32\VC6\Release\xerces-com.dll
 SOURCE="$(InputPath)"
 
-"$(OUTDIR)\xerces-c_2_2_0.dll"	"$(OUTDIR)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat
-	@echo off
-	echo copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_3_0.dll $(TargetDir)
-	copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_3_0.dll $(TargetDir)
-	regsvr32 /s /c "$(TargetPath)"
-	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
-<<
+"$(OUTDIR)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	regsvr32 /s /c "$(TargetPath)" 
+	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
+<< 
 	
 
-!ENDIF
+!ENDIF 
 
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL_PROJ=
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("xerces-com.dep")
 !INCLUDE "xerces-com.dep"
-!ELSE
+!ELSE 
 !MESSAGE Warning: cannot find "xerces-com.dep"
-!ENDIF
-!ENDIF
+!ENDIF 
+!ENDIF 
 
 
 !IF "$(CFG)" == "xml4com - Win32 Debug" || "$(CFG)" == "xml4com - Win32 Release MinDependency"
 SOURCE=..\..\..\..\..\src\xercesc\com\BindStatusCallback.cpp
 
-"$(INTDIR)\BindStatusCallback.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch"
+"$(INTDIR)\BindStatusCallback.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch" "..\..\..\..\..\src\xercesc\com\xml4com.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
@@ -333,7 +297,7 @@ SOURCE=..\..\..\..\..\src\xercesc\com\StdAfx.cpp
 
 !IF  "$(CFG)" == "xml4com - Win32 Debug"
 
-CPP_SWITCHES=/MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "_DEBUG" /D "_MBCS" /D "_ATL_DEBUG_INTERFACES" /D "_ATL_DEBUG_QI" /D "_ATL_DEBUG_REFCOUNT" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+CPP_SWITCHES=/MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "_DEBUG" /D "_MBCS" /D "_ATL_DEBUG_INTERFACES" /D "_ATL_DEBUG_QI" /D "_ATL_DEBUG_REFCOUNT" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\xerces-com.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 "$(INTDIR)\StdAfx.obj"	"$(INTDIR)\xerces-com.pch" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -343,7 +307,7 @@ CPP_SWITCHES=/MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /I "..\..\..\..\..
 
 !ELSEIF  "$(CFG)" == "xml4com - Win32 Release MinDependency"
 
-CPP_SWITCHES=/MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "NDEBUG" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_SWITCHES=/MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "NDEBUG" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\xerces-com.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 "$(INTDIR)\StdAfx.obj"	"$(INTDIR)\xerces-com.pch" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -351,29 +315,16 @@ CPP_SWITCHES=/MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xerc
 <<
 
 
-!ENDIF
+!ENDIF 
 
 SOURCE=..\..\..\..\..\src\xercesc\com\xml4com.cpp
 
-"$(INTDIR)\xml4com.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch"
+"$(INTDIR)\xml4com.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch" "..\..\..\..\..\src\xercesc\com\xml4com.h" "..\..\..\..\..\src\xercesc\com\xml4com_i.c"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=..\..\..\..\..\src\xercesc\com\xml4com.idl
-
-!IF  "$(CFG)" == "xml4com - Win32 Debug"
-
-MTL_SWITCHES=/I "..\..\..\..\..\src\xercesc\com" /tlb "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" /h "..\..\..\..\..\src\xercesc\com\xml4com.h" /iid "..\..\..\..\..\src\xercesc\com\xml4com_i.c"
-
-"..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb"	"..\..\..\..\..\src\xercesc\com\xml4com.h"	"..\..\..\..\..\src\xercesc\com\xml4com_i.c" : $(SOURCE) "$(INTDIR)"
-	$(MTL) @<<
-  $(MTL_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "xml4com - Win32 Release MinDependency"
-
-MTL_SWITCHES=/I "..\..\..\..\..\src\xercesc\com" /tlb "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" /h "..\..\..\..\..\src\xercesc\com\xml4com.h" /iid "..\..\..\..\..\src\xercesc\com\xml4com_i.c"
+MTL_SWITCHES=/I "..\..\..\..\..\src\xercesc\com" /tlb "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" /h "..\..\..\..\..\src\xercesc\com\xml4com.h" /iid "..\..\..\..\..\src\xercesc\com\xml4com_i.c" 
 
 "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb"	"..\..\..\..\..\src\xercesc\com\xml4com.h"	"..\..\..\..\..\src\xercesc\com\xml4com_i.c" : $(SOURCE) "$(INTDIR)"
 	$(MTL) @<<
@@ -381,126 +332,124 @@ MTL_SWITCHES=/I "..\..\..\..\..\src\xercesc\com" /tlb "..\..\..\..\..\Build\Win3
 <<
 
 
-!ENDIF
-
 SOURCE=..\..\..\..\..\src\xercesc\com\xml4com.rc
 
 !IF  "$(CFG)" == "xml4com - Win32 Debug"
 
 
-"$(INTDIR)\xml4com.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\xml4com.res" /i "\Xerces-Testing\src\xercesc\com" /d "_DEBUG" $(SOURCE)
+"$(INTDIR)\xml4com.res" : $(SOURCE) "$(INTDIR)" "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\xml4com.res" /i "\Xerces\Xerces-C\src\xercesc\com" /d "_DEBUG" $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "xml4com - Win32 Release MinDependency"
 
 
 "$(INTDIR)\xml4com.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\xml4com.res" /i "\Xerces-Testing\src\xercesc\com" /d "NDEBUG" $(SOURCE)
+	$(RSC) /l 0x409 /fo"$(INTDIR)\xml4com.res" /i "\Xerces\Xerces-C\src\xercesc\com" /d "NDEBUG" $(SOURCE)
 
 
-!ENDIF
+!ENDIF 
 
 SOURCE=..\..\..\..\..\src\xercesc\com\XMLDOMAttribute.cpp
 
-"$(INTDIR)\XMLDOMAttribute.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch"
+"$(INTDIR)\XMLDOMAttribute.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch" "..\..\..\..\..\src\xercesc\com\xml4com.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=..\..\..\..\..\src\xercesc\com\XMLDOMDocument.cpp
 
-"$(INTDIR)\XMLDOMDocument.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch"
+"$(INTDIR)\XMLDOMDocument.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch" "..\..\..\..\..\src\xercesc\com\xml4com.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=..\..\..\..\..\src\xercesc\com\XMLDOMDocumentType.cpp
 
-"$(INTDIR)\XMLDOMDocumentType.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch"
+"$(INTDIR)\XMLDOMDocumentType.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch" "..\..\..\..\..\src\xercesc\com\xml4com.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=..\..\..\..\..\src\xercesc\com\XMLDOMElement.cpp
 
-"$(INTDIR)\XMLDOMElement.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch"
+"$(INTDIR)\XMLDOMElement.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch" "..\..\..\..\..\src\xercesc\com\xml4com.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=..\..\..\..\..\src\xercesc\com\XMLDOMEntity.cpp
 
-"$(INTDIR)\XMLDOMEntity.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch"
+"$(INTDIR)\XMLDOMEntity.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch" "..\..\..\..\..\src\xercesc\com\xml4com.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=..\..\..\..\..\src\xercesc\com\XMLDOMImplementation.cpp
 
-"$(INTDIR)\XMLDOMImplementation.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch"
+"$(INTDIR)\XMLDOMImplementation.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch" "..\..\..\..\..\src\xercesc\com\xml4com.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=..\..\..\..\..\src\xercesc\com\XMLDOMNamedNodeMap.cpp
 
-"$(INTDIR)\XMLDOMNamedNodeMap.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch"
+"$(INTDIR)\XMLDOMNamedNodeMap.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch" "..\..\..\..\..\src\xercesc\com\xml4com.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=..\..\..\..\..\src\xercesc\com\XMLDOMNodeList.cpp
 
-"$(INTDIR)\XMLDOMNodeList.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch"
+"$(INTDIR)\XMLDOMNodeList.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch" "..\..\..\..\..\src\xercesc\com\xml4com.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=..\..\..\..\..\src\xercesc\com\XMLDOMNotation.cpp
 
-"$(INTDIR)\XMLDOMNotation.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch"
+"$(INTDIR)\XMLDOMNotation.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch" "..\..\..\..\..\src\xercesc\com\xml4com.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=..\..\..\..\..\src\xercesc\com\XMLDOMParseError.cpp
 
-"$(INTDIR)\XMLDOMParseError.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch"
+"$(INTDIR)\XMLDOMParseError.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch" "..\..\..\..\..\src\xercesc\com\xml4com.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=..\..\..\..\..\src\xercesc\com\XMLDOMProcessingInstruction.cpp
 
-"$(INTDIR)\XMLDOMProcessingInstruction.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch"
+"$(INTDIR)\XMLDOMProcessingInstruction.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch" "..\..\..\..\..\src\xercesc\com\xml4com.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=..\..\..\..\..\src\xercesc\com\XMLDOMUtil.cpp
 
-"$(INTDIR)\XMLDOMUtil.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch"
+"$(INTDIR)\XMLDOMUtil.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch" "..\..\..\..\..\src\xercesc\com\xml4com.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=..\..\..\..\..\src\xercesc\com\XMLDOMXMLDecl.cpp
 
-"$(INTDIR)\XMLDOMXMLDecl.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch"
+"$(INTDIR)\XMLDOMXMLDecl.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch" "..\..\..\..\..\src\xercesc\com\xml4com.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=..\..\..\..\..\src\xercesc\com\XMLHTTPRequest.cpp
 
-"$(INTDIR)\XMLHTTPRequest.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch"
+"$(INTDIR)\XMLHTTPRequest.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\xerces-com.pch" "..\..\..\..\..\src\xercesc\com\xml4com.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !IF  "$(CFG)" == "xml4com - Win32 Debug"
 
-"XercesLib - Win32 Debug" :
+"XercesLib - Win32 Debug" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug"
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug" 
    cd "..\xerces-com"
 
-"XercesLib - Win32 DebugCLEAN" :
+"XercesLib - Win32 DebugCLEAN" : 
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug" RECURSE=1 CLEAN
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\xerces-com"
 
 !ELSEIF  "$(CFG)" == "xml4com - Win32 Release MinDependency"
 
-!ENDIF
+!ENDIF 
 
 
-!ENDIF
+!ENDIF 
 
diff --git a/Projects/Win32/VC7.1/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj b/Projects/Win32/VC7.1/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj
index 60b92a4a4..e1f2c7588 100644
--- a/Projects/Win32/VC7.1/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="DOMNormalizerTest"
-	ProjectGUID="{69220042-712E-41B5-A658-4CCF9D5B5FDF}"
+	ProjectGUID="{BE9C14B1-2301-4c62-85E2-B583D22AE29C}"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
diff --git a/Projects/Win32/VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj b/Projects/Win32/VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj
index 5cc0c7fb3..847883dea 100644
--- a/Projects/Win32/VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj
@@ -33,7 +33,7 @@
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SEnumVal_vc71.pdb"
-				BrowseInformation="1"
+				BrowseInformation="0"
 				WarningLevel="3"
 				CompileAs="0"/>
 			<Tool
@@ -153,7 +153,7 @@
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SEnumVal_vc71.pdb"
-				BrowseInformation="1"
+				BrowseInformation="0"
 				WarningLevel="3"
 				CompileAs="0"/>
 			<Tool
diff --git a/Projects/Win32/VC7.1/xerces-all/XInclude/XInclude.vcproj b/Projects/Win32/VC7.1/xerces-all/XInclude/XInclude.vcproj
new file mode 100644
index 000000000..2a988bf37
--- /dev/null
+++ b/Projects/Win32/VC7.1/xerces-all/XInclude/XInclude.vcproj
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="XInclude"
+	ProjectGUID="{117D4C21-4C54-478F-83AE-D6179A8D7EF1}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC7.1\Release"
+			IntermediateDirectory=".\..\..\..\..\..\Build\Win32\VC7.1\Release\obj"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="2"
+				OptimizeForProcessor="0"
+				AdditionalIncludeDirectories="..\..\..\..\..\src"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				PrecompiledHeaderFile="$(IntDir)\XInclude.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\XInclude_vc71.pdb"
+				BrowseInformation="1"
+				WarningLevel="3"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="xerces-c_3.lib"
+				OutputFile="$(OutDir)\XInclude.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(OutDir)"
+				ProgramDatabaseFile="$(OutDir)\XInclude.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\..\..\..\..\..\Build\Win32\VC7.1\Release/XInclude.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC7.1\Debug"
+			IntermediateDirectory=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				OptimizeForProcessor="0"
+				AdditionalIncludeDirectories="..\..\..\..\..\src"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				RuntimeLibrary="3"
+				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="FALSE"
+				PrecompiledHeaderFile="$(IntDir)\XInclude.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\XInclude_vc71.pdb"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="xerces-c_3D.lib"
+				OutputFile="$(OutDir)\XInclude.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)\XInclude.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\..\..\..\..\..\Build\Win32\VC7.1\Debug/XInclude.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC7.1\StaticRelease"
+			IntermediateDirectory=".\..\..\..\..\..\Build\Win32\VC7.1\StaticRelease\obj"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="2"
+				OptimizeForProcessor="0"
+				AdditionalIncludeDirectories="..\..\..\..\..\src"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				PrecompiledHeaderFile="$(IntDir)\XInclude.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\XInclude_vc71.pdb"
+				BrowseInformation="1"
+				WarningLevel="3"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="xerces-c_static_3.lib"
+				OutputFile="$(OutDir)\XInclude.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(OutDir)"
+				ProgramDatabaseFile="$(OutDir)\XInclude.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\..\..\..\..\..\Build\Win32\VC7.1\StaticRelease/XInclude.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC7.1\StaticDebug"
+			IntermediateDirectory=".\..\..\..\..\..\Build\Win32\VC7.1\StaticDebug\obj"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				OptimizeForProcessor="0"
+				AdditionalIncludeDirectories="..\..\..\..\..\src"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				RuntimeLibrary="1"
+				DisableLanguageExtensions="TRUE"
+				PrecompiledHeaderFile="$(IntDir)\XInclude.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\XInclude_vc71.pdb"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="xerces-c_static_3D.lib"
+				OutputFile="$(OutDir)\XInclude.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)\XInclude.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\..\..\..\..\..\Build\Win32\VC7.1\StaticDebug/XInclude.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\..\..\..\samples\src\XInclude\XInclude.cpp">
+		</File>
+		<File
+			RelativePath="..\..\..\..\..\samples\src\XInclude\XInclude.hpp">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj b/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
index feb993e36..8253d941c 100644
--- a/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
@@ -691,10 +691,10 @@ copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)
 				RelativePath="..\..\..\..\..\src\xercesc\util\XMLStringTokenizer.hpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\src\xercesc\util\XMLUCS4Transcoder.hpp">
+				RelativePath="..\..\..\..\..\src\xercesc\util\XMLUCS4Transcoder.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\src\xercesc\util\XMLUCS4Transcoder.cpp">
+				RelativePath="..\..\..\..\..\src\xercesc\util\XMLUCS4Transcoder.hpp">
 			</File>
 			<File
 				RelativePath="..\..\..\..\..\src\xercesc\util\XMLUni.cpp">
@@ -2753,6 +2753,28 @@ copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="xinclude"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\..\src\xercesc\xinclude\XIncludeDOMDocumentProcessor.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\xercesc\xinclude\XIncludeDOMDocumentProcessor.hpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\xercesc\xinclude\XIncludeLocation.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\xercesc\xinclude\XIncludeLocation.hpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\xercesc\xinclude\XIncludeUtils.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\xercesc\xinclude\XIncludeUtils.hpp">
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/Projects/Win32/VC7.1/xerces-all/xerces-all.sln b/Projects/Win32/VC7.1/xerces-all/xerces-all.sln
index 78340fc6d..5ba403e78 100644
--- a/Projects/Win32/VC7.1/xerces-all/xerces-all.sln
+++ b/Projects/Win32/VC7.1/xerces-all/xerces-all.sln
@@ -3,17 +3,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all\all.vcproj", "{E
 	ProjectSection(ProjectDependencies) = postProject
 		{26A4FA00-DB6E-43FA-83D4-0FC3A5472A27} = {26A4FA00-DB6E-43FA-83D4-0FC3A5472A27}
 		{569D5A1E-C582-40B7-8BFC-FC7B5D4DDA75} = {569D5A1E-C582-40B7-8BFC-FC7B5D4DDA75}
+		{117D4C21-4C54-478F-83AE-D6179A8D7EF1} = {117D4C21-4C54-478F-83AE-D6179A8D7EF1}
 		{792C0625-DE93-4756-AAFA-23CCED2157B0} = {792C0625-DE93-4756-AAFA-23CCED2157B0}
 		{8709DC2A-0EC9-4B67-9E98-95D5174B2C3F} = {8709DC2A-0EC9-4B67-9E98-95D5174B2C3F}
 		{BBD46C34-DEA0-42AB-96AB-E87C6371A6C2} = {BBD46C34-DEA0-42AB-96AB-E87C6371A6C2}
 		{2230D938-8908-4C12-9E96-9C6C4048A52D} = {2230D938-8908-4C12-9E96-9C6C4048A52D}
 		{69220042-712E-41B5-A658-4CCF9D5B5FDF} = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF} = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF} = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF} = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF} = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF} = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF} = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
 		{160AC448-AD35-4FA9-8C4D-FF46A0E5BE5D} = {160AC448-AD35-4FA9-8C4D-FF46A0E5BE5D}
 		{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
 		{4D8FEA60-A74F-4267-852F-C421AF12198D} = {4D8FEA60-A74F-4267-852F-C421AF12198D}
@@ -25,6 +20,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all\all.vcproj", "{E
 		{2AB767A9-6A3B-4993-8FDB-3E6A30560739} = {2AB767A9-6A3B-4993-8FDB-3E6A30560739}
 		{2682B2AB-E341-4528-85AB-BE95DE77A9BC} = {2682B2AB-E341-4528-85AB-BE95DE77A9BC}
 		{959445AC-9081-4590-B457-C96164CF4BFA} = {959445AC-9081-4590-B457-C96164CF4BFA}
+		{BE9C14B1-2301-4C62-85E2-B583D22AE29C} = {BE9C14B1-2301-4C62-85E2-B583D22AE29C}
 		{DFC196B9-2146-4CDA-AC0A-632BD38FA41D} = {DFC196B9-2146-4CDA-AC0A-632BD38FA41D}
 		{D3552FBC-8618-43C5-86C0-237536D8E700} = {D3552FBC-8618-43C5-86C0-237536D8E700}
 		{9488FCC8-E44D-468C-B805-85001457ECFB} = {9488FCC8-E44D-468C-B805-85001457ECFB}
@@ -52,7 +48,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DOMMemTest", "DOMMemTest\DO
 		{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DOMNormalizerTest", "DOMNormalizerTest\DOMNormalizerTest.vcproj", "{69220042-712E-41B5-A658-4CCF9D5B5FDF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DOMNormalizerTest", "DOMNormalizerTest\DOMNormalizerTest.vcproj", "{BE9C14B1-2301-4C62-85E2-B583D22AE29C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
 	EndProjectSection
@@ -181,6 +177,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XSValueTest", "XSValueTest\
 		{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XInclude", "XInclude\XInclude.vcproj", "{117D4C21-4C54-478F-83AE-D6179A8D7EF1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
 		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
@@ -191,6 +192,8 @@ Global
 		Static Debug = Static Debug
 		Static Release = Static Release
 	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.Debug.ActiveCfg = Debug|Win32
 		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.Debug.Build.0 = Debug|Win32
@@ -224,14 +227,14 @@ Global
 		{0D9CB6CF-DB0B-495D-B674-8FC3DD3C12C2}.Static Debug.Build.0 = Static Debug|Win32
 		{0D9CB6CF-DB0B-495D-B674-8FC3DD3C12C2}.Static Release.ActiveCfg = Static Release|Win32
 		{0D9CB6CF-DB0B-495D-B674-8FC3DD3C12C2}.Static Release.Build.0 = Static Release|Win32
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF}.Debug.ActiveCfg = Debug|Win32
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF}.Debug.Build.0 = Debug|Win32
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF}.Release.ActiveCfg = Release|Win32
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF}.Release.Build.0 = Release|Win32
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF}.Static Debug.ActiveCfg = Static Debug|Win32
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF}.Static Debug.Build.0 = Static Debug|Win32
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF}.Static Release.ActiveCfg = Static Release|Win32
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF}.Static Release.Build.0 = Static Release|Win32
+		{BE9C14B1-2301-4C62-85E2-B583D22AE29C}.Debug.ActiveCfg = Debug|Win32
+		{BE9C14B1-2301-4C62-85E2-B583D22AE29C}.Debug.Build.0 = Debug|Win32
+		{BE9C14B1-2301-4C62-85E2-B583D22AE29C}.Release.ActiveCfg = Release|Win32
+		{BE9C14B1-2301-4C62-85E2-B583D22AE29C}.Release.Build.0 = Release|Win32
+		{BE9C14B1-2301-4C62-85E2-B583D22AE29C}.Static Debug.ActiveCfg = Static Debug|Win32
+		{BE9C14B1-2301-4C62-85E2-B583D22AE29C}.Static Debug.Build.0 = Static Debug|Win32
+		{BE9C14B1-2301-4C62-85E2-B583D22AE29C}.Static Release.ActiveCfg = Static Release|Win32
+		{BE9C14B1-2301-4C62-85E2-B583D22AE29C}.Static Release.Build.0 = Static Release|Win32
 		{056463A8-AEDD-4B92-BC24-C0C154C0379C}.Debug.ActiveCfg = Debug|Win32
 		{056463A8-AEDD-4B92-BC24-C0C154C0379C}.Debug.Build.0 = Debug|Win32
 		{056463A8-AEDD-4B92-BC24-C0C154C0379C}.Release.ActiveCfg = Release|Win32
@@ -432,6 +435,14 @@ Global
 		{D3552FBC-8618-43C5-86C0-237536D8E700}.Static Debug.Build.0 = Static Debug|Win32
 		{D3552FBC-8618-43C5-86C0-237536D8E700}.Static Release.ActiveCfg = Static Release|Win32
 		{D3552FBC-8618-43C5-86C0-237536D8E700}.Static Release.Build.0 = Static Release|Win32
+		{117D4C21-4C54-478F-83AE-D6179A8D7EF1}.Debug.ActiveCfg = Debug|Win32
+		{117D4C21-4C54-478F-83AE-D6179A8D7EF1}.Debug.Build.0 = Debug|Win32
+		{117D4C21-4C54-478F-83AE-D6179A8D7EF1}.Release.ActiveCfg = Release|Win32
+		{117D4C21-4C54-478F-83AE-D6179A8D7EF1}.Release.Build.0 = Release|Win32
+		{117D4C21-4C54-478F-83AE-D6179A8D7EF1}.Static Debug.ActiveCfg = Static Debug|Win32
+		{117D4C21-4C54-478F-83AE-D6179A8D7EF1}.Static Debug.Build.0 = Static Debug|Win32
+		{117D4C21-4C54-478F-83AE-D6179A8D7EF1}.Static Release.ActiveCfg = Static Release|Win32
+		{117D4C21-4C54-478F-83AE-D6179A8D7EF1}.Static Release.Build.0 = Static Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/Projects/Win32/VC8/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj b/Projects/Win32/VC8/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj
index 44069898c..e8cd1c6a3 100644
--- a/Projects/Win32/VC8/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj
+++ b/Projects/Win32/VC8/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8,00"
 	Name="DOMNormalizerTest"
-	ProjectGUID="{69220042-712E-41B5-A658-4CCF9D5B5FDF}"
+	ProjectGUID="{BE9C14B1-2301-4c62-85E2-B583D22AE29C}"
 	>
 	<Platforms>
 		<Platform
diff --git a/Projects/Win32/VC8/xerces-all/XInclude/XInclude.vcproj b/Projects/Win32/VC8/xerces-all/XInclude/XInclude.vcproj
new file mode 100644
index 000000000..64383980d
--- /dev/null
+++ b/Projects/Win32/VC8/xerces-all/XInclude/XInclude.vcproj
@@ -0,0 +1,380 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="XInclude"
+	ProjectGUID="{117D4C21-4C54-478F-83AE-D6179A8D7EF1}"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\Release"
+			IntermediateDirectory="$(OutDir)\obj\XInclude"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName="$(OutDir)\XInclude.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\..\..\src"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile="$(IntDir)\XInclude.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\XInclude_vc80"
+				BrowseInformation="0"
+				WarningLevel="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="xerces-c_3.lib"
+				OutputFile="$(OutDir)\XInclude.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(OutDir)"
+				ProgramDatabaseFile="$(OutDir)\XInclude.pdb"
+				SubSystem="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\Debug"
+			IntermediateDirectory="$(OutDir)\obj\XInclude"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName="$(OutDir)\XInclude.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\..\..\src"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				RuntimeLibrary="3"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
+				PrecompiledHeaderFile="$(IntDir)\XInclude.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\XInclude_vc80"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="xerces-c_3D.lib"
+				OutputFile="$(OutDir)\XInclude.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\XInclude.pdb"
+				SubSystem="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\StaticRelease"
+			IntermediateDirectory="$(OutDir)\obj\XInclude"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName="$(OutDir)\XInclude.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\..\..\src"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile="$(IntDir)\XInclude.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\XInclude_vc80"
+				BrowseInformation="1"
+				WarningLevel="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="xerces-c_static_3.lib"
+				OutputFile="$(OutDir)\XInclude.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(OutDir)"
+				ProgramDatabaseFile="$(OutDir)\XInclude.pdb"
+				SubSystem="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\StaticDebug"
+			IntermediateDirectory="$(OutDir)\obj\XInclude"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName="$(OutDir)\XInclude.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\..\..\src"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				RuntimeLibrary="1"
+				DisableLanguageExtensions="true"
+				PrecompiledHeaderFile="$(IntDir)\XInclude.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\XInclude_vc80"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="xerces-c_static_3D.lib"
+				OutputFile="$(OutDir)\XInclude.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\XInclude.pdb"
+				SubSystem="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\..\..\..\samples\src\XInclude\XInclude.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\..\..\samples\src\XInclude\XInclude.hpp"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Projects/Win32/VC8/xerces-all/xerces-all.sln b/Projects/Win32/VC8/xerces-all/xerces-all.sln
index 1aa18d2f5..a529d1467 100644
--- a/Projects/Win32/VC8/xerces-all/xerces-all.sln
+++ b/Projects/Win32/VC8/xerces-all/xerces-all.sln
@@ -4,16 +4,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all\all.vcproj", "{E
 	ProjectSection(ProjectDependencies) = postProject
 		{26A4FA00-DB6E-43FA-83D4-0FC3A5472A27} = {26A4FA00-DB6E-43FA-83D4-0FC3A5472A27}
 		{569D5A1E-C582-40B7-8BFC-FC7B5D4DDA75} = {569D5A1E-C582-40B7-8BFC-FC7B5D4DDA75}
+		{117D4C21-4C54-478F-83AE-D6179A8D7EF1} = {117D4C21-4C54-478F-83AE-D6179A8D7EF1}
 		{792C0625-DE93-4756-AAFA-23CCED2157B0} = {792C0625-DE93-4756-AAFA-23CCED2157B0}
 		{8709DC2A-0EC9-4B67-9E98-95D5174B2C3F} = {8709DC2A-0EC9-4B67-9E98-95D5174B2C3F}
 		{BBD46C34-DEA0-42AB-96AB-E87C6371A6C2} = {BBD46C34-DEA0-42AB-96AB-E87C6371A6C2}
 		{2230D938-8908-4C12-9E96-9C6C4048A52D} = {2230D938-8908-4C12-9E96-9C6C4048A52D}
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF} = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF} = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF} = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF} = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF} = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
-		{69220042-712E-41B5-A658-4CCF9D5B5FDF} = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
+		{BE9C14B1-2301-4c62-85E2-B583D22AE29C} = {BE9C14B1-2301-4c62-85E2-B583D22AE29C}
 		{69220042-712E-41B5-A658-4CCF9D5B5FDF} = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
 		{160AC448-AD35-4FA9-8C4D-FF46A0E5BE5D} = {160AC448-AD35-4FA9-8C4D-FF46A0E5BE5D}
 		{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
@@ -54,7 +50,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DOMMemTest", "DOMMemTest\DO
 		{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DOMNormalizerTest", "DOMNormalizerTest\DOMNormalizerTest.vcproj", "{69220042-712E-41B5-A658-4CCF9D5B5FDF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DOMNormalizerTest", "DOMNormalizerTest\DOMNormalizerTest.vcproj", "{BE9C14B1-2301-4c62-85E2-B583D22AE29C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
 	EndProjectSection
@@ -181,6 +177,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XSValueTest", "XSValueTest\
 		{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XInclude", "XInclude\XInclude.vcproj", "{117D4C21-4C54-478F-83AE-D6179A8D7EF1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -429,6 +430,22 @@ Global
 		{D3552FBC-8618-43C5-86C0-237536D8E700}.Static Debug|Win32.Build.0 = Static Debug|Win32
 		{D3552FBC-8618-43C5-86C0-237536D8E700}.Static Release|Win32.ActiveCfg = Static Release|Win32
 		{D3552FBC-8618-43C5-86C0-237536D8E700}.Static Release|Win32.Build.0 = Static Release|Win32
+		{117D4C21-4C54-478F-83AE-D6179A8D7EF1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{117D4C21-4C54-478F-83AE-D6179A8D7EF1}.Debug|Win32.Build.0 = Debug|Win32
+		{117D4C21-4C54-478F-83AE-D6179A8D7EF1}.Release|Win32.ActiveCfg = Release|Win32
+		{117D4C21-4C54-478F-83AE-D6179A8D7EF1}.Release|Win32.Build.0 = Release|Win32
+		{117D4C21-4C54-478F-83AE-D6179A8D7EF1}.Static Debug|Win32.ActiveCfg = Static Debug|Win32
+		{117D4C21-4C54-478F-83AE-D6179A8D7EF1}.Static Debug|Win32.Build.0 = Static Debug|Win32
+		{117D4C21-4C54-478F-83AE-D6179A8D7EF1}.Static Release|Win32.ActiveCfg = Static Release|Win32
+		{117D4C21-4C54-478F-83AE-D6179A8D7EF1}.Static Release|Win32.Build.0 = Static Release|Win32
+		{BE9C14B1-2301-4c62-85E2-B583D22AE29C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BE9C14B1-2301-4c62-85E2-B583D22AE29C}.Debug|Win32.Build.0 = Debug|Win32
+		{BE9C14B1-2301-4c62-85E2-B583D22AE29C}.Release|Win32.ActiveCfg = Release|Win32
+		{BE9C14B1-2301-4c62-85E2-B583D22AE29C}.Release|Win32.Build.0 = Release|Win32
+		{BE9C14B1-2301-4c62-85E2-B583D22AE29C}.Static Debug|Win32.ActiveCfg = Static Debug|Win32
+		{BE9C14B1-2301-4c62-85E2-B583D22AE29C}.Static Debug|Win32.Build.0 = Static Debug|Win32
+		{BE9C14B1-2301-4c62-85E2-B583D22AE29C}.Static Release|Win32.ActiveCfg = Static Release|Win32
+		{BE9C14B1-2301-4c62-85E2-B583D22AE29C}.Static Release|Win32.Build.0 = Static Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/samples/Makefile.am b/samples/Makefile.am
index f1ce2d9fb..56f9be008 100644
--- a/samples/Makefile.am
+++ b/samples/Makefile.am
@@ -86,6 +86,8 @@ sampleprogs +=						StdInParse
 StdInParse_SOURCES =					src/StdInParse/StdInParse.cpp \
 							src/StdInParse/StdInParseHandlers.cpp
 									
+sampleprogs +=						XInclude
+XInclude_SOURCES =					src/XInclude/XInclude.cpp
 									
 #
 # Override generated rules to provide prettier make rules
diff --git a/samples/Makefile.in b/samples/Makefile.in
index 49cdb886c..5098eaade 100644
--- a/samples/Makefile.in
+++ b/samples/Makefile.in
@@ -94,7 +94,7 @@ am__EXEEXT_1 = CreateDOMDocument$(EXEEXT) DOMCount$(EXEEXT) \
 	PParse$(EXEEXT) PSVIWriter$(EXEEXT) Redirect$(EXEEXT) \
 	SAX2Count$(EXEEXT) SAX2Print$(EXEEXT) SAXCount$(EXEEXT) \
 	SAXPrint$(EXEEXT) SCMPrint$(EXEEXT) SEnumVal$(EXEEXT) \
-	StdInParse$(EXEEXT)
+	StdInParse$(EXEEXT) XInclude$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
@@ -173,6 +173,10 @@ am_StdInParse_OBJECTS = src/StdInParse/StdInParse.$(OBJEXT) \
 StdInParse_OBJECTS = $(am_StdInParse_OBJECTS)
 StdInParse_LDADD = $(LDADD)
 StdInParse_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
+am_XInclude_OBJECTS = src/XInclude/XInclude.$(OBJEXT)
+XInclude_OBJECTS = $(am_XInclude_OBJECTS)
+XInclude_LDADD = $(LDADD)
+XInclude_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/src/xercesc/util
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -184,13 +188,13 @@ SOURCES = $(CreateDOMDocument_SOURCES) $(DOMCount_SOURCES) \
 	$(PParse_SOURCES) $(PSVIWriter_SOURCES) $(Redirect_SOURCES) \
 	$(SAX2Count_SOURCES) $(SAX2Print_SOURCES) $(SAXCount_SOURCES) \
 	$(SAXPrint_SOURCES) $(SCMPrint_SOURCES) $(SEnumVal_SOURCES) \
-	$(StdInParse_SOURCES)
+	$(StdInParse_SOURCES) $(XInclude_SOURCES)
 DIST_SOURCES = $(CreateDOMDocument_SOURCES) $(DOMCount_SOURCES) \
 	$(DOMPrint_SOURCES) $(EnumVal_SOURCES) $(MemParse_SOURCES) \
 	$(PParse_SOURCES) $(PSVIWriter_SOURCES) $(Redirect_SOURCES) \
 	$(SAX2Count_SOURCES) $(SAX2Print_SOURCES) $(SAXCount_SOURCES) \
 	$(SAXPrint_SOURCES) $(SCMPrint_SOURCES) $(SEnumVal_SOURCES) \
-	$(StdInParse_SOURCES)
+	$(StdInParse_SOURCES) $(XInclude_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -362,7 +366,7 @@ LDADD = ${top_builddir}/obj/libxerces.la
 AM_CPPFLAGS = -I${top_builddir}/src -I${top_srcdir}/src
 sampleprogs = CreateDOMDocument DOMCount DOMPrint EnumVal MemParse \
 	PParse PSVIWriter Redirect SAX2Count SAX2Print SAXCount \
-	SAXPrint SCMPrint SEnumVal StdInParse
+	SAXPrint SCMPrint SEnumVal StdInParse XInclude
 CreateDOMDocument_SOURCES = src/CreateDOMDocument/CreateDOMDocument.cpp
 DOMCount_SOURCES = src/DOMCount/DOMCount.cpp
 DOMPrint_SOURCES = src/DOMPrint/DOMPrint.cpp \
@@ -401,6 +405,7 @@ SEnumVal_SOURCES = src/SEnumVal/SEnumVal.cpp
 StdInParse_SOURCES = src/StdInParse/StdInParse.cpp \
 							src/StdInParse/StdInParseHandlers.cpp
 
+XInclude_SOURCES = src/XInclude/XInclude.cpp
 @XERCES_PRETTY_MAKE_TRUE@PRETTY_MAKE = ${top_srcdir}/config/pretty-make
 @XERCES_PRETTY_MAKE_TRUE@PRETTY_COMPILE = ${PRETTY_MAKE} Compiling
 CXXCOMPILE = ${PRETTY_COMPILE} \
@@ -672,6 +677,17 @@ src/StdInParse/StdInParseHandlers.$(OBJEXT):  \
 StdInParse$(EXEEXT): $(StdInParse_OBJECTS) $(StdInParse_DEPENDENCIES) 
 	@rm -f StdInParse$(EXEEXT)
 	$(CXXLINK) $(StdInParse_LDFLAGS) $(StdInParse_OBJECTS) $(StdInParse_LDADD) $(LIBS)
+src/XInclude/$(am__dirstamp):
+	@$(mkdir_p) src/XInclude
+	@: > src/XInclude/$(am__dirstamp)
+src/XInclude/$(DEPDIR)/$(am__dirstamp):
+	@$(mkdir_p) src/XInclude/$(DEPDIR)
+	@: > src/XInclude/$(DEPDIR)/$(am__dirstamp)
+src/XInclude/XInclude.$(OBJEXT): src/XInclude/$(am__dirstamp) \
+	src/XInclude/$(DEPDIR)/$(am__dirstamp)
+XInclude$(EXEEXT): $(XInclude_OBJECTS) $(XInclude_DEPENDENCIES) 
+	@rm -f XInclude$(EXEEXT)
+	$(CXXLINK) $(XInclude_LDFLAGS) $(XInclude_OBJECTS) $(XInclude_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -703,6 +719,7 @@ mostlyclean-compile:
 	-rm -f src/SEnumVal/SEnumVal.$(OBJEXT)
 	-rm -f src/StdInParse/StdInParse.$(OBJEXT)
 	-rm -f src/StdInParse/StdInParseHandlers.$(OBJEXT)
+	-rm -f src/XInclude/XInclude.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -735,6 +752,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/SEnumVal/$(DEPDIR)/SEnumVal.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/StdInParse/$(DEPDIR)/StdInParse.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/StdInParse/$(DEPDIR)/StdInParseHandlers.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/XInclude/$(DEPDIR)/XInclude.Po@am__quote@
 
 @XERCES_PRETTY_MAKE_FALSE@.cpp.o:
 @am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
@@ -902,6 +920,8 @@ distclean-generic:
 	-rm -f src/SEnumVal/$(am__dirstamp)
 	-rm -f src/StdInParse/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/StdInParse/$(am__dirstamp)
+	-rm -f src/XInclude/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/XInclude/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -911,7 +931,7 @@ clean: clean-am
 clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf src/CreateDOMDocument/$(DEPDIR) src/DOMCount/$(DEPDIR) src/DOMPrint/$(DEPDIR) src/EnumVal/$(DEPDIR) src/MemParse/$(DEPDIR) src/PParse/$(DEPDIR) src/PSVIWriter/$(DEPDIR) src/Redirect/$(DEPDIR) src/SAX2Count/$(DEPDIR) src/SAX2Print/$(DEPDIR) src/SAXCount/$(DEPDIR) src/SAXPrint/$(DEPDIR) src/SCMPrint/$(DEPDIR) src/SEnumVal/$(DEPDIR) src/StdInParse/$(DEPDIR)
+	-rm -rf src/CreateDOMDocument/$(DEPDIR) src/DOMCount/$(DEPDIR) src/DOMPrint/$(DEPDIR) src/EnumVal/$(DEPDIR) src/MemParse/$(DEPDIR) src/PParse/$(DEPDIR) src/PSVIWriter/$(DEPDIR) src/Redirect/$(DEPDIR) src/SAX2Count/$(DEPDIR) src/SAX2Print/$(DEPDIR) src/SAXCount/$(DEPDIR) src/SAXPrint/$(DEPDIR) src/SCMPrint/$(DEPDIR) src/SEnumVal/$(DEPDIR) src/StdInParse/$(DEPDIR) src/XInclude/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -937,7 +957,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf src/CreateDOMDocument/$(DEPDIR) src/DOMCount/$(DEPDIR) src/DOMPrint/$(DEPDIR) src/EnumVal/$(DEPDIR) src/MemParse/$(DEPDIR) src/PParse/$(DEPDIR) src/PSVIWriter/$(DEPDIR) src/Redirect/$(DEPDIR) src/SAX2Count/$(DEPDIR) src/SAX2Print/$(DEPDIR) src/SAXCount/$(DEPDIR) src/SAXPrint/$(DEPDIR) src/SCMPrint/$(DEPDIR) src/SEnumVal/$(DEPDIR) src/StdInParse/$(DEPDIR)
+	-rm -rf src/CreateDOMDocument/$(DEPDIR) src/DOMCount/$(DEPDIR) src/DOMPrint/$(DEPDIR) src/EnumVal/$(DEPDIR) src/MemParse/$(DEPDIR) src/PParse/$(DEPDIR) src/PSVIWriter/$(DEPDIR) src/Redirect/$(DEPDIR) src/SAX2Count/$(DEPDIR) src/SAX2Print/$(DEPDIR) src/SAXCount/$(DEPDIR) src/SAXPrint/$(DEPDIR) src/SCMPrint/$(DEPDIR) src/SEnumVal/$(DEPDIR) src/StdInParse/$(DEPDIR) src/XInclude/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 30af2f1f0..2bf378755 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -92,6 +92,11 @@ libvalidators_ladir =				${includedir}
 nobase_libvalidators_la_HEADERS =	${validators_headers}
 libvalidators_la_SOURCES =			${validators_sources}
 
+src_libraries +=					libxinclude.la
+libxinclude_ladir =				${includedir}
+nobase_libxinclude_la_HEADERS =	                ${xinclude_headers}
+libxinclude_la_SOURCES =			${xinclude_sources}
+
 #
 # NetAccessors, conditionally built based on settings from configure
 #
@@ -1085,6 +1090,15 @@ validators_sources = \
 	xercesc/validators/schema/XSDLocator.cpp \
 	xercesc/validators/schema/XUtil.cpp
 
+xinclude_headers = \
+	xercesc/xinclude/XIncludeDOMDocumentProcessor.hpp \
+        xercesc/xinclude/XIncludeLocation.hpp \
+        xercesc/xinclude/XIncludeUtils.hpp
+	
+xinclude_sources = \
+	xercesc/xinclude/XIncludeDOMDocumentProcessor.cpp \
+        xercesc/xinclude/XIncludeLocation.cpp \
+        xercesc/xinclude/XIncludeUtils.cpp
 
 icu_headers = \
 	xercesc/util/Transcoders/ICU/ICUTransService.hpp
@@ -1279,3 +1293,4 @@ LTCXXCOMPILE = ${PRETTY_COMPILE}  \
 
 
 
+
diff --git a/src/Makefile.in b/src/Makefile.in
index cce0bdae3..ad5f19e01 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -134,7 +134,8 @@ DIST_COMMON = $(am__nobase_libcfurlna_la_HEADERS_DIST) \
 	$(nobase_libinternal_la_HEADERS) \
 	$(nobase_libparsers_la_HEADERS) $(nobase_libsax2_la_HEADERS) \
 	$(nobase_libsax_la_HEADERS) $(nobase_libutil_la_HEADERS) \
-	$(nobase_libvalidators_la_HEADERS) $(srcdir)/Makefile.am \
+	$(nobase_libvalidators_la_HEADERS) \
+	$(nobase_libxinclude_la_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
@@ -482,18 +483,18 @@ libsocketsna_la_OBJECTS = $(am_libsocketsna_la_OBJECTS)
 @XERCES_USE_FILEMGR_WINDOWS_TRUE@am__DEPENDENCIES_22 = libwinfmgr.la
 am__DEPENDENCIES_23 = libutil.la libdom.la libdomimpl.la \
 	libframework.la libinternal.la libparsers.la libsax.la \
-	libsax2.la libvalidators.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
-	$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
-	$(am__DEPENDENCIES_6) $(am__DEPENDENCIES_7) \
-	$(am__DEPENDENCIES_8) $(am__DEPENDENCIES_9) \
-	$(am__DEPENDENCIES_10) $(am__DEPENDENCIES_11) \
-	$(am__DEPENDENCIES_12) $(am__DEPENDENCIES_13) \
-	$(am__DEPENDENCIES_14) $(am__DEPENDENCIES_15) \
-	$(am__DEPENDENCIES_16) $(am__DEPENDENCIES_17) \
-	$(am__DEPENDENCIES_18) $(am__DEPENDENCIES_19) \
-	$(am__DEPENDENCIES_20) $(am__DEPENDENCIES_21) \
-	$(am__DEPENDENCIES_22)
+	libsax2.la libvalidators.la libxinclude.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4) \
+	$(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+	$(am__DEPENDENCIES_7) $(am__DEPENDENCIES_8) \
+	$(am__DEPENDENCIES_9) $(am__DEPENDENCIES_10) \
+	$(am__DEPENDENCIES_11) $(am__DEPENDENCIES_12) \
+	$(am__DEPENDENCIES_13) $(am__DEPENDENCIES_14) \
+	$(am__DEPENDENCIES_15) $(am__DEPENDENCIES_16) \
+	$(am__DEPENDENCIES_17) $(am__DEPENDENCIES_18) \
+	$(am__DEPENDENCIES_19) $(am__DEPENDENCIES_20) \
+	$(am__DEPENDENCIES_21) $(am__DEPENDENCIES_22)
 libsrc_la_DEPENDENCIES = $(am__DEPENDENCIES_23)
 am_libsrc_la_OBJECTS =
 libsrc_la_OBJECTS = $(am_libsrc_la_OBJECTS)
@@ -696,6 +697,12 @@ am__objects_31 = xercesc/util/NetAccessors/libWWW/libwwwna_la-LibWWWNetAccessor.
 @XERCES_USE_NETACCESSOR_LIBWWW_TRUE@	$(am__objects_31)
 libwwwna_la_OBJECTS = $(am_libwwwna_la_OBJECTS)
 @XERCES_USE_NETACCESSOR_LIBWWW_TRUE@am_libwwwna_la_rpath =
+libxinclude_la_LIBADD =
+am__objects_32 = xercesc/xinclude/XIncludeDOMDocumentProcessor.lo \
+	xercesc/xinclude/XIncludeLocation.lo \
+	xercesc/xinclude/XIncludeUtils.lo
+am_libxinclude_la_OBJECTS = $(am__objects_32)
+libxinclude_la_OBJECTS = $(am_libxinclude_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/src/xercesc/util
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -726,7 +733,7 @@ SOURCES = $(libcfurlna_la_SOURCES) $(libcurlna_la_SOURCES) \
 	$(libvalidators_la_SOURCES) $(libwinaomgr_la_SOURCES) \
 	$(libwinfmgr_la_SOURCES) $(libwinmmgr_la_SOURCES) \
 	$(libwinsockna_la_SOURCES) $(libwintrans_la_SOURCES) \
-	$(libwwwna_la_SOURCES)
+	$(libwwwna_la_SOURCES) $(libxinclude_la_SOURCES)
 DIST_SOURCES = $(am__libcfurlna_la_SOURCES_DIST) \
 	$(am__libcurlna_la_SOURCES_DIST) $(libdom_la_SOURCES) \
 	$(libdomimpl_la_SOURCES) $(libframework_la_SOURCES) \
@@ -750,7 +757,7 @@ DIST_SOURCES = $(am__libcfurlna_la_SOURCES_DIST) \
 	$(am__libwinmmgr_la_SOURCES_DIST) \
 	$(am__libwinsockna_la_SOURCES_DIST) \
 	$(am__libwintrans_la_SOURCES_DIST) \
-	$(am__libwwwna_la_SOURCES_DIST)
+	$(am__libwwwna_la_SOURCES_DIST) $(libxinclude_la_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-exec-recursive install-info-recursive \
@@ -790,7 +797,8 @@ am__installdirs = "$(DESTDIR)$(libcfurlna_ladir)" \
 	"$(DESTDIR)$(libwinfmgr_ladir)" \
 	"$(DESTDIR)$(libwinmmgr_ladir)" \
 	"$(DESTDIR)$(libwinsockna_ladir)" \
-	"$(DESTDIR)$(libwintrans_ladir)" "$(DESTDIR)$(libwwwna_ladir)"
+	"$(DESTDIR)$(libwintrans_ladir)" "$(DESTDIR)$(libwwwna_ladir)" \
+	"$(DESTDIR)$(libxinclude_ladir)"
 nobase_libcfurlna_laHEADERS_INSTALL = $(install_sh_DATA)
 am__nobase_libcurlna_la_HEADERS_DIST =  \
 	xercesc/util/NetAccessors/Curl/CurlNetAccessor.hpp \
@@ -869,6 +877,7 @@ am__nobase_libwwwna_la_HEADERS_DIST =  \
 	xercesc/util/NetAccessors/libWWW/LibWWWNetAccessor.hpp \
 	xercesc/util/NetAccessors/libWWW/BinURLInputStream.hpp
 nobase_libwwwna_laHEADERS_INSTALL = $(install_sh_DATA)
+nobase_libxinclude_laHEADERS_INSTALL = $(install_sh_DATA)
 HEADERS = $(nobase_libcfurlna_la_HEADERS) \
 	$(nobase_libcurlna_la_HEADERS) $(nobase_libdom_la_HEADERS) \
 	$(nobase_libdomimpl_la_HEADERS) \
@@ -894,7 +903,8 @@ HEADERS = $(nobase_libcfurlna_la_HEADERS) \
 	$(nobase_libwinfmgr_la_HEADERS) \
 	$(nobase_libwinmmgr_la_HEADERS) \
 	$(nobase_libwinsockna_la_HEADERS) \
-	$(nobase_libwintrans_la_HEADERS) $(nobase_libwwwna_la_HEADERS)
+	$(nobase_libwintrans_la_HEADERS) $(nobase_libwwwna_la_HEADERS) \
+	$(nobase_libxinclude_la_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = xercesc/util/MsgLoaders/ICU/resources
@@ -1087,14 +1097,14 @@ libsrc_la_LIBADD = ${src_libraries}
 #
 src_libraries = libutil.la libdom.la libdomimpl.la libframework.la \
 	libinternal.la libparsers.la libsax.la libsax2.la \
-	libvalidators.la $(am__append_1) $(am__append_2) \
-	$(am__append_3) $(am__append_4) $(am__append_5) \
-	$(am__append_6) $(am__append_7) $(am__append_8) \
-	$(am__append_9) $(am__append_10) $(am__append_11) \
-	$(am__append_12) $(am__append_14) $(am__append_15) \
-	$(am__append_16) $(am__append_17) $(am__append_18) \
-	$(am__append_19) $(am__append_20) $(am__append_21) \
-	$(am__append_22) $(am__append_23)
+	libvalidators.la libxinclude.la $(am__append_1) \
+	$(am__append_2) $(am__append_3) $(am__append_4) \
+	$(am__append_5) $(am__append_6) $(am__append_7) \
+	$(am__append_8) $(am__append_9) $(am__append_10) \
+	$(am__append_11) $(am__append_12) $(am__append_14) \
+	$(am__append_15) $(am__append_16) $(am__append_17) \
+	$(am__append_18) $(am__append_19) $(am__append_20) \
+	$(am__append_21) $(am__append_22) $(am__append_23)
 libutil_ladir = ${includedir}
 nobase_libutil_la_HEADERS = ${util_headers}
 libutil_la_SOURCES = ${util_sources}
@@ -1122,6 +1132,9 @@ libsax2_la_SOURCES = ${sax2_sources}
 libvalidators_ladir = ${includedir}
 nobase_libvalidators_la_HEADERS = ${validators_headers}
 libvalidators_la_SOURCES = ${validators_sources}
+libxinclude_ladir = ${includedir}
+nobase_libxinclude_la_HEADERS = ${xinclude_headers}
+libxinclude_la_SOURCES = ${xinclude_sources}
 @XERCES_USE_NETACCESSOR_CURL_TRUE@libcurlna_ladir = ${includedir}
 @XERCES_USE_NETACCESSOR_CURL_TRUE@nobase_libcurlna_la_HEADERS = ${curl_headers}
 @XERCES_USE_NETACCESSOR_CURL_TRUE@libcurlna_la_SOURCES = ${curl_sources}
@@ -1999,6 +2012,16 @@ validators_sources = \
 	xercesc/validators/schema/XSDLocator.cpp \
 	xercesc/validators/schema/XUtil.cpp
 
+xinclude_headers = \
+	xercesc/xinclude/XIncludeDOMDocumentProcessor.hpp \
+        xercesc/xinclude/XIncludeLocation.hpp \
+        xercesc/xinclude/XIncludeUtils.hpp
+
+xinclude_sources = \
+	xercesc/xinclude/XIncludeDOMDocumentProcessor.cpp \
+        xercesc/xinclude/XIncludeLocation.cpp \
+        xercesc/xinclude/XIncludeUtils.cpp
+
 icu_headers = \
 	xercesc/util/Transcoders/ICU/ICUTransService.hpp
 
@@ -3295,6 +3318,22 @@ xercesc/util/NetAccessors/libWWW/libwwwna_la-BinURLInputStream.lo:  \
 	xercesc/util/NetAccessors/libWWW/$(DEPDIR)/$(am__dirstamp)
 libwwwna.la: $(libwwwna_la_OBJECTS) $(libwwwna_la_DEPENDENCIES) 
 	$(CXXLINK) $(am_libwwwna_la_rpath) $(libwwwna_la_LDFLAGS) $(libwwwna_la_OBJECTS) $(libwwwna_la_LIBADD) $(LIBS)
+xercesc/xinclude/$(am__dirstamp):
+	@$(mkdir_p) xercesc/xinclude
+	@: > xercesc/xinclude/$(am__dirstamp)
+xercesc/xinclude/$(DEPDIR)/$(am__dirstamp):
+	@$(mkdir_p) xercesc/xinclude/$(DEPDIR)
+	@: > xercesc/xinclude/$(DEPDIR)/$(am__dirstamp)
+xercesc/xinclude/XIncludeDOMDocumentProcessor.lo:  \
+	xercesc/xinclude/$(am__dirstamp) \
+	xercesc/xinclude/$(DEPDIR)/$(am__dirstamp)
+xercesc/xinclude/XIncludeLocation.lo:  \
+	xercesc/xinclude/$(am__dirstamp) \
+	xercesc/xinclude/$(DEPDIR)/$(am__dirstamp)
+xercesc/xinclude/XIncludeUtils.lo: xercesc/xinclude/$(am__dirstamp) \
+	xercesc/xinclude/$(DEPDIR)/$(am__dirstamp)
+libxinclude.la: $(libxinclude_la_OBJECTS) $(libxinclude_la_DEPENDENCIES) 
+	$(CXXLINK)  $(libxinclude_la_LDFLAGS) $(libxinclude_la_OBJECTS) $(libxinclude_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -3942,6 +3981,12 @@ mostlyclean-compile:
 	-rm -f xercesc/validators/schema/identity/XPathSymbols.lo
 	-rm -f xercesc/validators/schema/identity/XercesXPath.$(OBJEXT)
 	-rm -f xercesc/validators/schema/identity/XercesXPath.lo
+	-rm -f xercesc/xinclude/XIncludeDOMDocumentProcessor.$(OBJEXT)
+	-rm -f xercesc/xinclude/XIncludeDOMDocumentProcessor.lo
+	-rm -f xercesc/xinclude/XIncludeLocation.$(OBJEXT)
+	-rm -f xercesc/xinclude/XIncludeLocation.lo
+	-rm -f xercesc/xinclude/XIncludeUtils.$(OBJEXT)
+	-rm -f xercesc/xinclude/XIncludeUtils.lo
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -4268,6 +4313,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@xercesc/validators/schema/identity/$(DEPDIR)/XPathMatcherStack.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@xercesc/validators/schema/identity/$(DEPDIR)/XPathSymbols.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@xercesc/validators/schema/identity/$(DEPDIR)/XercesXPath.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xercesc/xinclude/$(DEPDIR)/XIncludeDOMDocumentProcessor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xercesc/xinclude/$(DEPDIR)/XIncludeLocation.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xercesc/xinclude/$(DEPDIR)/XIncludeUtils.Plo@am__quote@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
@@ -4364,6 +4412,7 @@ clean-libtool:
 	-rm -rf xercesc/validators/datatype/.libs xercesc/validators/datatype/_libs
 	-rm -rf xercesc/validators/schema/.libs xercesc/validators/schema/_libs
 	-rm -rf xercesc/validators/schema/identity/.libs xercesc/validators/schema/identity/_libs
+	-rm -rf xercesc/xinclude/.libs xercesc/xinclude/_libs
 
 distclean-libtool:
 	-rm -f libtool
@@ -4957,6 +5006,25 @@ uninstall-nobase_libwwwna_laHEADERS:
 	  echo " rm -f '$(DESTDIR)$(libwwwna_ladir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(libwwwna_ladir)/$$f"; \
 	done
+install-nobase_libxinclude_laHEADERS: $(nobase_libxinclude_la_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(libxinclude_ladir)" || $(mkdir_p) "$(DESTDIR)$(libxinclude_ladir)"
+	@$(am__vpath_adj_setup) \
+	list='$(nobase_libxinclude_la_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  $(am__vpath_adj) \
+	  echo " $(nobase_libxinclude_laHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libxinclude_ladir)/$$f'"; \
+	  $(nobase_libxinclude_laHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libxinclude_ladir)/$$f"; \
+	done
+
+uninstall-nobase_libxinclude_laHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@$(am__vpath_adj_setup) \
+	list='$(nobase_libxinclude_la_HEADERS)'; for p in $$list; do \
+	  $(am__vpath_adj) \
+	  echo " rm -f '$(DESTDIR)$(libxinclude_ladir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(libxinclude_ladir)/$$f"; \
+	done
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -5091,7 +5159,7 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/xercesc/dom $(distdir)/xercesc/dom/impl $(distdir)/xercesc/framework $(distdir)/xercesc/framework/psvi $(distdir)/xercesc/internal $(distdir)/xercesc/parsers $(distdir)/xercesc/sax $(distdir)/xercesc/sax2 $(distdir)/xercesc/util $(distdir)/xercesc/util/AtomicOpManagers $(distdir)/xercesc/util/FileManagers $(distdir)/xercesc/util/MsgLoaders/ICU $(distdir)/xercesc/util/MsgLoaders/InMemory $(distdir)/xercesc/util/MsgLoaders/MsgCatalog $(distdir)/xercesc/util/MutexManagers $(distdir)/xercesc/util/NetAccessors/Curl $(distdir)/xercesc/util/NetAccessors/MacOSURLAccessCF $(distdir)/xercesc/util/NetAccessors/Socket $(distdir)/xercesc/util/NetAccessors/WinSock $(distdir)/xercesc/util/NetAccessors/libWWW $(distdir)/xercesc/util/Transcoders/ICU $(distdir)/xercesc/util/Transcoders/Iconv $(distdir)/xercesc/util/Transcoders/IconvGNU $(distdir)/xercesc/util/Transcoders/MacOSUnicodeConverter $(distdir)/xercesc/util/Transcoders/Win32 $(distdir)/xercesc/util/regx $(distdir)/xercesc/validators/DTD $(distdir)/xercesc/validators/common $(distdir)/xercesc/validators/datatype $(distdir)/xercesc/validators/schema $(distdir)/xercesc/validators/schema/identity
+	$(mkdir_p) $(distdir)/xercesc/dom $(distdir)/xercesc/dom/impl $(distdir)/xercesc/framework $(distdir)/xercesc/framework/psvi $(distdir)/xercesc/internal $(distdir)/xercesc/parsers $(distdir)/xercesc/sax $(distdir)/xercesc/sax2 $(distdir)/xercesc/util $(distdir)/xercesc/util/AtomicOpManagers $(distdir)/xercesc/util/FileManagers $(distdir)/xercesc/util/MsgLoaders/ICU $(distdir)/xercesc/util/MsgLoaders/InMemory $(distdir)/xercesc/util/MsgLoaders/MsgCatalog $(distdir)/xercesc/util/MutexManagers $(distdir)/xercesc/util/NetAccessors/Curl $(distdir)/xercesc/util/NetAccessors/MacOSURLAccessCF $(distdir)/xercesc/util/NetAccessors/Socket $(distdir)/xercesc/util/NetAccessors/WinSock $(distdir)/xercesc/util/NetAccessors/libWWW $(distdir)/xercesc/util/Transcoders/ICU $(distdir)/xercesc/util/Transcoders/Iconv $(distdir)/xercesc/util/Transcoders/IconvGNU $(distdir)/xercesc/util/Transcoders/MacOSUnicodeConverter $(distdir)/xercesc/util/Transcoders/Win32 $(distdir)/xercesc/util/regx $(distdir)/xercesc/validators/DTD $(distdir)/xercesc/validators/common $(distdir)/xercesc/validators/datatype $(distdir)/xercesc/validators/schema $(distdir)/xercesc/validators/schema/identity $(distdir)/xercesc/xinclude
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -5138,7 +5206,7 @@ check: check-recursive
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(libcfurlna_ladir)" "$(DESTDIR)$(libcurlna_ladir)" "$(DESTDIR)$(libdom_ladir)" "$(DESTDIR)$(libdomimpl_ladir)" "$(DESTDIR)$(libframework_ladir)" "$(DESTDIR)$(libgnuiconvtc_ladir)" "$(DESTDIR)$(libiconvtc_ladir)" "$(DESTDIR)$(libicutc_ladir)" "$(DESTDIR)$(libinternal_ladir)" "$(DESTDIR)$(libmacosaomgr_ladir)" "$(DESTDIR)$(libmacosunicodeconverter_ladir)" "$(DESTDIR)$(libmsgiconv_ladir)" "$(DESTDIR)$(libmsgicu_ladir)" "$(DESTDIR)$(libmsginmemory_ladir)" "$(DESTDIR)$(libnothreadaomgr_ladir)" "$(DESTDIR)$(libnothreadmmgr_ladir)" "$(DESTDIR)$(libparsers_ladir)" "$(DESTDIR)$(libposixaomgr_ladir)" "$(DESTDIR)$(libposixfmgr_ladir)" "$(DESTDIR)$(libposixmmgr_ladir)" "$(DESTDIR)$(libsax2_ladir)" "$(DESTDIR)$(libsax_ladir)" "$(DESTDIR)$(libsocketsna_ladir)" "$(DESTDIR)$(libutil_ladir)" "$(DESTDIR)$(libvalidators_ladir)" "$(DESTDIR)$(libwinaomgr_ladir)" "$(DESTDIR)$(libwinfmgr_ladir)" "$(DESTDIR)$(libwinmmgr_ladir)" "$(DESTDIR)$(libwinsockna_ladir)" "$(DESTDIR)$(libwintrans_ladir)" "$(DESTDIR)$(libwwwna_ladir)"; do \
+	for dir in "$(DESTDIR)$(libcfurlna_ladir)" "$(DESTDIR)$(libcurlna_ladir)" "$(DESTDIR)$(libdom_ladir)" "$(DESTDIR)$(libdomimpl_ladir)" "$(DESTDIR)$(libframework_ladir)" "$(DESTDIR)$(libgnuiconvtc_ladir)" "$(DESTDIR)$(libiconvtc_ladir)" "$(DESTDIR)$(libicutc_ladir)" "$(DESTDIR)$(libinternal_ladir)" "$(DESTDIR)$(libmacosaomgr_ladir)" "$(DESTDIR)$(libmacosunicodeconverter_ladir)" "$(DESTDIR)$(libmsgiconv_ladir)" "$(DESTDIR)$(libmsgicu_ladir)" "$(DESTDIR)$(libmsginmemory_ladir)" "$(DESTDIR)$(libnothreadaomgr_ladir)" "$(DESTDIR)$(libnothreadmmgr_ladir)" "$(DESTDIR)$(libparsers_ladir)" "$(DESTDIR)$(libposixaomgr_ladir)" "$(DESTDIR)$(libposixfmgr_ladir)" "$(DESTDIR)$(libposixmmgr_ladir)" "$(DESTDIR)$(libsax2_ladir)" "$(DESTDIR)$(libsax_ladir)" "$(DESTDIR)$(libsocketsna_ladir)" "$(DESTDIR)$(libutil_ladir)" "$(DESTDIR)$(libvalidators_ladir)" "$(DESTDIR)$(libwinaomgr_ladir)" "$(DESTDIR)$(libwinfmgr_ladir)" "$(DESTDIR)$(libwinmmgr_ladir)" "$(DESTDIR)$(libwinsockna_ladir)" "$(DESTDIR)$(libwintrans_ladir)" "$(DESTDIR)$(libwwwna_ladir)" "$(DESTDIR)$(libxinclude_ladir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
@@ -5223,6 +5291,8 @@ distclean-generic:
 	-rm -f xercesc/validators/schema/$(am__dirstamp)
 	-rm -f xercesc/validators/schema/identity/$(DEPDIR)/$(am__dirstamp)
 	-rm -f xercesc/validators/schema/identity/$(am__dirstamp)
+	-rm -f xercesc/xinclude/$(DEPDIR)/$(am__dirstamp)
+	-rm -f xercesc/xinclude/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -5233,7 +5303,7 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-recursive
-	-rm -rf xercesc/dom/$(DEPDIR) xercesc/dom/impl/$(DEPDIR) xercesc/framework/$(DEPDIR) xercesc/framework/psvi/$(DEPDIR) xercesc/internal/$(DEPDIR) xercesc/parsers/$(DEPDIR) xercesc/sax/$(DEPDIR) xercesc/sax2/$(DEPDIR) xercesc/util/$(DEPDIR) xercesc/util/AtomicOpManagers/$(DEPDIR) xercesc/util/FileManagers/$(DEPDIR) xercesc/util/MsgLoaders/ICU/$(DEPDIR) xercesc/util/MsgLoaders/InMemory/$(DEPDIR) xercesc/util/MsgLoaders/MsgCatalog/$(DEPDIR) xercesc/util/MutexManagers/$(DEPDIR) xercesc/util/NetAccessors/Curl/$(DEPDIR) xercesc/util/NetAccessors/MacOSURLAccessCF/$(DEPDIR) xercesc/util/NetAccessors/Socket/$(DEPDIR) xercesc/util/NetAccessors/WinSock/$(DEPDIR) xercesc/util/NetAccessors/libWWW/$(DEPDIR) xercesc/util/Transcoders/ICU/$(DEPDIR) xercesc/util/Transcoders/Iconv/$(DEPDIR) xercesc/util/Transcoders/IconvGNU/$(DEPDIR) xercesc/util/Transcoders/MacOSUnicodeConverter/$(DEPDIR) xercesc/util/Transcoders/Win32/$(DEPDIR) xercesc/util/regx/$(DEPDIR) xercesc/validators/DTD/$(DEPDIR) xercesc/validators/common/$(DEPDIR) xercesc/validators/datatype/$(DEPDIR) xercesc/validators/schema/$(DEPDIR) xercesc/validators/schema/identity/$(DEPDIR)
+	-rm -rf xercesc/dom/$(DEPDIR) xercesc/dom/impl/$(DEPDIR) xercesc/framework/$(DEPDIR) xercesc/framework/psvi/$(DEPDIR) xercesc/internal/$(DEPDIR) xercesc/parsers/$(DEPDIR) xercesc/sax/$(DEPDIR) xercesc/sax2/$(DEPDIR) xercesc/util/$(DEPDIR) xercesc/util/AtomicOpManagers/$(DEPDIR) xercesc/util/FileManagers/$(DEPDIR) xercesc/util/MsgLoaders/ICU/$(DEPDIR) xercesc/util/MsgLoaders/InMemory/$(DEPDIR) xercesc/util/MsgLoaders/MsgCatalog/$(DEPDIR) xercesc/util/MutexManagers/$(DEPDIR) xercesc/util/NetAccessors/Curl/$(DEPDIR) xercesc/util/NetAccessors/MacOSURLAccessCF/$(DEPDIR) xercesc/util/NetAccessors/Socket/$(DEPDIR) xercesc/util/NetAccessors/WinSock/$(DEPDIR) xercesc/util/NetAccessors/libWWW/$(DEPDIR) xercesc/util/Transcoders/ICU/$(DEPDIR) xercesc/util/Transcoders/Iconv/$(DEPDIR) xercesc/util/Transcoders/IconvGNU/$(DEPDIR) xercesc/util/Transcoders/MacOSUnicodeConverter/$(DEPDIR) xercesc/util/Transcoders/Win32/$(DEPDIR) xercesc/util/regx/$(DEPDIR) xercesc/validators/DTD/$(DEPDIR) xercesc/validators/common/$(DEPDIR) xercesc/validators/datatype/$(DEPDIR) xercesc/validators/schema/$(DEPDIR) xercesc/validators/schema/identity/$(DEPDIR) xercesc/xinclude/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -5278,7 +5348,8 @@ install-data-am: install-nobase_libcfurlna_laHEADERS \
 	install-nobase_libwinmmgr_laHEADERS \
 	install-nobase_libwinsockna_laHEADERS \
 	install-nobase_libwintrans_laHEADERS \
-	install-nobase_libwwwna_laHEADERS
+	install-nobase_libwwwna_laHEADERS \
+	install-nobase_libxinclude_laHEADERS
 
 install-exec-am:
 
@@ -5289,7 +5360,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-	-rm -rf xercesc/dom/$(DEPDIR) xercesc/dom/impl/$(DEPDIR) xercesc/framework/$(DEPDIR) xercesc/framework/psvi/$(DEPDIR) xercesc/internal/$(DEPDIR) xercesc/parsers/$(DEPDIR) xercesc/sax/$(DEPDIR) xercesc/sax2/$(DEPDIR) xercesc/util/$(DEPDIR) xercesc/util/AtomicOpManagers/$(DEPDIR) xercesc/util/FileManagers/$(DEPDIR) xercesc/util/MsgLoaders/ICU/$(DEPDIR) xercesc/util/MsgLoaders/InMemory/$(DEPDIR) xercesc/util/MsgLoaders/MsgCatalog/$(DEPDIR) xercesc/util/MutexManagers/$(DEPDIR) xercesc/util/NetAccessors/Curl/$(DEPDIR) xercesc/util/NetAccessors/MacOSURLAccessCF/$(DEPDIR) xercesc/util/NetAccessors/Socket/$(DEPDIR) xercesc/util/NetAccessors/WinSock/$(DEPDIR) xercesc/util/NetAccessors/libWWW/$(DEPDIR) xercesc/util/Transcoders/ICU/$(DEPDIR) xercesc/util/Transcoders/Iconv/$(DEPDIR) xercesc/util/Transcoders/IconvGNU/$(DEPDIR) xercesc/util/Transcoders/MacOSUnicodeConverter/$(DEPDIR) xercesc/util/Transcoders/Win32/$(DEPDIR) xercesc/util/regx/$(DEPDIR) xercesc/validators/DTD/$(DEPDIR) xercesc/validators/common/$(DEPDIR) xercesc/validators/datatype/$(DEPDIR) xercesc/validators/schema/$(DEPDIR) xercesc/validators/schema/identity/$(DEPDIR)
+	-rm -rf xercesc/dom/$(DEPDIR) xercesc/dom/impl/$(DEPDIR) xercesc/framework/$(DEPDIR) xercesc/framework/psvi/$(DEPDIR) xercesc/internal/$(DEPDIR) xercesc/parsers/$(DEPDIR) xercesc/sax/$(DEPDIR) xercesc/sax2/$(DEPDIR) xercesc/util/$(DEPDIR) xercesc/util/AtomicOpManagers/$(DEPDIR) xercesc/util/FileManagers/$(DEPDIR) xercesc/util/MsgLoaders/ICU/$(DEPDIR) xercesc/util/MsgLoaders/InMemory/$(DEPDIR) xercesc/util/MsgLoaders/MsgCatalog/$(DEPDIR) xercesc/util/MutexManagers/$(DEPDIR) xercesc/util/NetAccessors/Curl/$(DEPDIR) xercesc/util/NetAccessors/MacOSURLAccessCF/$(DEPDIR) xercesc/util/NetAccessors/Socket/$(DEPDIR) xercesc/util/NetAccessors/WinSock/$(DEPDIR) xercesc/util/NetAccessors/libWWW/$(DEPDIR) xercesc/util/Transcoders/ICU/$(DEPDIR) xercesc/util/Transcoders/Iconv/$(DEPDIR) xercesc/util/Transcoders/IconvGNU/$(DEPDIR) xercesc/util/Transcoders/MacOSUnicodeConverter/$(DEPDIR) xercesc/util/Transcoders/Win32/$(DEPDIR) xercesc/util/regx/$(DEPDIR) xercesc/validators/DTD/$(DEPDIR) xercesc/validators/common/$(DEPDIR) xercesc/validators/datatype/$(DEPDIR) xercesc/validators/schema/$(DEPDIR) xercesc/validators/schema/identity/$(DEPDIR) xercesc/xinclude/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -5336,7 +5407,8 @@ uninstall-am: uninstall-info-am uninstall-nobase_libcfurlna_laHEADERS \
 	uninstall-nobase_libwinmmgr_laHEADERS \
 	uninstall-nobase_libwinsockna_laHEADERS \
 	uninstall-nobase_libwintrans_laHEADERS \
-	uninstall-nobase_libwwwna_laHEADERS
+	uninstall-nobase_libwwwna_laHEADERS \
+	uninstall-nobase_libxinclude_laHEADERS
 
 uninstall-info: uninstall-info-recursive
 
@@ -5378,13 +5450,14 @@ uninstall-info: uninstall-info-recursive
 	install-nobase_libwinmmgr_laHEADERS \
 	install-nobase_libwinsockna_laHEADERS \
 	install-nobase_libwintrans_laHEADERS \
-	install-nobase_libwwwna_laHEADERS install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-nobase_libcfurlna_laHEADERS \
+	install-nobase_libwwwna_laHEADERS \
+	install-nobase_libxinclude_laHEADERS install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-info-am uninstall-nobase_libcfurlna_laHEADERS \
 	uninstall-nobase_libcurlna_laHEADERS \
 	uninstall-nobase_libdom_laHEADERS \
 	uninstall-nobase_libdomimpl_laHEADERS \
@@ -5414,7 +5487,8 @@ uninstall-info: uninstall-info-recursive
 	uninstall-nobase_libwinmmgr_laHEADERS \
 	uninstall-nobase_libwinsockna_laHEADERS \
 	uninstall-nobase_libwintrans_laHEADERS \
-	uninstall-nobase_libwwwna_laHEADERS
+	uninstall-nobase_libwwwna_laHEADERS \
+	uninstall-nobase_libxinclude_laHEADERS
 
 
 #
-- 
GitLab