From b7b79ebea8e75212abe64d58dda1ef2e399bd943 Mon Sep 17 00:00:00 2001
From: David N Bertoni <dbertoni@apache.org>
Date: Fri, 28 Dec 2007 19:58:26 +0000
Subject: [PATCH] Removed unnecessary /MACHINE directives.  Added
 configurations for XSTSHarness and fixed static configurations.

git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@607318 13f79535-47bb-0310-9956-ffa450edef68
---
 .../CreateDOMDocument.vcproj                  |   8 +-
 .../VC7.1/xerces-all/DOMCount/DOMCount.vcproj |   8 +-
 .../xerces-all/DOMMemTest/DOMMemTest.vcproj   |   8 +-
 .../DOMNormalizerTest.vcproj                  |   8 +-
 .../VC7.1/xerces-all/DOMPrint/DOMPrint.vcproj |   8 +-
 .../VC7.1/xerces-all/DOMTest/DOMTest.vcproj   |   8 +-
 .../DOMTraversalTest/DOMTraversalTest.vcproj  |   8 +-
 .../DOMTypeInfoTest/DOMTypeInfoTest.vcproj    |   8 +-
 .../EncodingTest/EncodingTest.vcproj          |   8 +-
 .../VC7.1/xerces-all/EnumVal/EnumVal.vcproj   |   8 +-
 .../InitTermTest/InitTermTest.vcproj          |   8 +-
 .../MemHandlerTest/MemHandlerTest.vcproj      |   8 +-
 .../VC7.1/xerces-all/MemParse/MemParse.vcproj |   8 +-
 .../VC7.1/xerces-all/PParse/PParse.vcproj     |   8 +-
 .../xerces-all/PSVIWriter/PSVIWriter.vcproj   |   8 +-
 .../xerces-all/RangeTest/RangeTest.vcproj     |   8 +-
 .../VC7.1/xerces-all/Redirect/Redirect.vcproj |   8 +-
 .../xerces-all/SAX2Count/SAX2Count.vcproj     |   8 +-
 .../xerces-all/SAX2Print/SAX2Print.vcproj     |   8 +-
 .../VC7.1/xerces-all/SAXCount/SAXCount.vcproj |   8 +-
 .../VC7.1/xerces-all/SAXPrint/SAXPrint.vcproj |   8 +-
 .../VC7.1/xerces-all/SCMPrint/SCMPrint.vcproj |   8 +-
 .../VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj |   8 +-
 .../xerces-all/StdInParse/StdInParse.vcproj   |   8 +-
 .../xerces-all/ThreadTest/ThreadTest.vcproj   |   8 +-
 .../VC7.1/xerces-all/XInclude/XInclude.vcproj |   8 +-
 .../xerces-all/XSValueTest/XSValueTest.vcproj |   8 +-
 .../XSerializerTest/XSerializerTest.vcproj    |   8 +-
 .../xerces-all/XercesLib/XercesLib.vcproj     |   4 +-
 .../xerces-all/xerces-com/xerces-com.vcproj   |   8 +-
 .../CreateDOMDocument.vcproj                  | 136 ++++----
 .../VC8/xerces-all/DOMCount/DOMCount.vcproj   | 128 ++++---
 .../xerces-all/DOMMemTest/DOMMemTest.vcproj   | 132 ++++---
 .../DOMNormalizerTest.vcproj                  | 132 ++++---
 .../VC8/xerces-all/DOMPrint/DOMPrint.vcproj   | 132 ++++---
 .../VC8/xerces-all/DOMTest/DOMTest.vcproj     | 132 ++++---
 .../DOMTraversalTest/DOMTraversalTest.vcproj  | 128 ++++---
 .../DOMTypeInfoTest/DOMTypeInfoTest.vcproj    | 128 ++++---
 .../EncodingTest/EncodingTest.vcproj          | 132 ++++---
 .../VC8/xerces-all/EnumVal/EnumVal.vcproj     | 126 ++++---
 .../InitTermTest/InitTermTest.vcproj          | 134 ++++----
 .../MemHandlerTest/MemHandlerTest.vcproj      | 138 ++++----
 .../VC8/xerces-all/MemParse/MemParse.vcproj   | 126 ++++---
 .../Win32/VC8/xerces-all/PParse/PParse.vcproj | 130 ++++---
 .../xerces-all/PSVIWriter/PSVIWriter.vcproj   | 134 ++++----
 .../VC8/xerces-all/RangeTest/RangeTest.vcproj | 126 ++++---
 .../VC8/xerces-all/Redirect/Redirect.vcproj   | 126 ++++---
 .../VC8/xerces-all/SAX2Count/SAX2Count.vcproj | 126 ++++---
 .../VC8/xerces-all/SAX2Print/SAX2Print.vcproj | 126 ++++---
 .../VC8/xerces-all/SAXCount/SAXCount.vcproj   | 126 ++++---
 .../VC8/xerces-all/SAXPrint/SAXPrint.vcproj   | 126 ++++---
 .../VC8/xerces-all/SCMPrint/SCMPrint.vcproj   | 130 ++++---
 .../VC8/xerces-all/SEnumVal/SEnumVal.vcproj   | 130 ++++---
 .../xerces-all/StdInParse/StdInParse.vcproj   | 130 ++++---
 .../xerces-all/ThreadTest/ThreadTest.vcproj   | 130 ++++---
 .../VC8/xerces-all/XInclude/XInclude.vcproj   | 136 ++++----
 .../xerces-all/XSTSHarness/XSTSHarness.vcproj | 325 +++++++++++++++++-
 .../xerces-all/XSValueTest/XSValueTest.vcproj | 128 ++++---
 .../XSerializerTest/XSerializerTest.vcproj    | 130 ++++---
 .../VC8/xerces-all/XercesLib/XercesLib.vcproj |   8 +-
 Projects/Win32/VC8/xerces-all/all/all.vcproj  |  50 +--
 Projects/Win32/VC8/xerces-all/xerces-all.sln  |  18 +-
 .../xerces-all/xerces-com/xerces-com.vcproj   | 162 +++++----
 .../CreateDOMDocument.vcproj                  |   2 +-
 .../Win32/VC7.1/DOMCount/DOMCount.vcproj      |   2 +-
 .../Win32/VC7.1/DOMPrint/DOMPrint.vcproj      |   2 +-
 .../Win32/VC7.1/EnumVal/EnumVal.vcproj        |   2 +-
 .../Win32/VC7.1/MemParse/MemParse.vcproj      |   2 +-
 .../Projects/Win32/VC7.1/PParse/PParse.vcproj |   2 +-
 .../Win32/VC7.1/PSVIWriter/PSVIWriter.vcproj  |   2 +-
 .../Win32/VC7.1/Redirect/Redirect.vcproj      |   2 +-
 .../Win32/VC7.1/SAX2Count/SAX2Count.vcproj    |   2 +-
 .../Win32/VC7.1/SAX2Print/SAX2Print.vcproj    |   2 +-
 .../Win32/VC7.1/SAXCount/SAXCount.vcproj      |   2 +-
 .../Win32/VC7.1/SAXPrint/SAXPrint.vcproj      |   2 +-
 .../Win32/VC7.1/SCMPrint/scmprint.vcproj      |   2 +-
 .../Win32/VC7.1/SEnumVal/SEnumVal.vcproj      |   2 +-
 .../Win32/VC7.1/StdInParse/StdInParse.vcproj  |   2 +-
 78 files changed, 2356 insertions(+), 2111 deletions(-)

diff --git a/Projects/Win32/VC7.1/xerces-all/CreateDOMDocument/CreateDOMDocument.vcproj b/Projects/Win32/VC7.1/xerces-all/CreateDOMDocument/CreateDOMDocument.vcproj
index 87a3151a3..6539d2f2d 100644
--- a/Projects/Win32/VC7.1/xerces-all/CreateDOMDocument/CreateDOMDocument.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/CreateDOMDocument/CreateDOMDocument.vcproj
@@ -40,7 +40,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\CreateDOMDocument.exe"
 				LinkIncremental="1"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\CreateDOMDocument.exe"
 				LinkIncremental="2"
@@ -159,7 +159,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\CreateDOMDocument.exe"
 				LinkIncremental="1"
@@ -217,7 +217,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\CreateDOMDocument.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/DOMCount/DOMCount.vcproj b/Projects/Win32/VC7.1/xerces-all/DOMCount/DOMCount.vcproj
index 79d04edc5..5f510a760 100644
--- a/Projects/Win32/VC7.1/xerces-all/DOMCount/DOMCount.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/DOMCount/DOMCount.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMCount.exe"
 				LinkIncremental="1"
@@ -96,7 +96,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMCount.exe"
 				LinkIncremental="2"
@@ -156,7 +156,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMCount.exe"
 				LinkIncremental="1"
@@ -212,7 +212,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMCount.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/DOMMemTest/DOMMemTest.vcproj b/Projects/Win32/VC7.1/xerces-all/DOMMemTest/DOMMemTest.vcproj
index 9521427ff..f557cd834 100644
--- a/Projects/Win32/VC7.1/xerces-all/DOMMemTest/DOMMemTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/DOMMemTest/DOMMemTest.vcproj
@@ -37,7 +37,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMMemTest.exe"
 				LinkIncremental="1"
@@ -97,7 +97,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMMemTest.exe"
 				LinkIncremental="2"
@@ -155,7 +155,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMMemTest.exe"
 				LinkIncremental="1"
@@ -214,7 +214,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMMemTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj b/Projects/Win32/VC7.1/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj
index e1f2c7588..210705105 100644
--- a/Projects/Win32/VC7.1/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj
@@ -37,7 +37,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMNormalizerTest.exe"
 				LinkIncremental="1"
@@ -97,7 +97,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMNormalizerTest.exe"
 				LinkIncremental="2"
@@ -155,7 +155,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMNormalizerTest.exe"
 				LinkIncremental="1"
@@ -214,7 +214,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMNormalizerTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/DOMPrint/DOMPrint.vcproj b/Projects/Win32/VC7.1/xerces-all/DOMPrint/DOMPrint.vcproj
index 6a1d23b7e..f89dd6b2f 100644
--- a/Projects/Win32/VC7.1/xerces-all/DOMPrint/DOMPrint.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/DOMPrint/DOMPrint.vcproj
@@ -38,7 +38,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMPrint.exe"
 				LinkIncremental="1"
@@ -97,7 +97,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMPrint.exe"
 				LinkIncremental="2"
@@ -156,7 +156,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMPrint.exe"
 				LinkIncremental="1"
@@ -214,7 +214,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMPrint.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/DOMTest/DOMTest.vcproj b/Projects/Win32/VC7.1/xerces-all/DOMTest/DOMTest.vcproj
index 43d3b11ec..33f956129 100644
--- a/Projects/Win32/VC7.1/xerces-all/DOMTest/DOMTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/DOMTest/DOMTest.vcproj
@@ -37,7 +37,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMTest.exe"
 				LinkIncremental="1"
@@ -97,7 +97,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMTest.exe"
 				LinkIncremental="2"
@@ -155,7 +155,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMTest.exe"
 				LinkIncremental="1"
@@ -214,7 +214,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/DOMTraversalTest/DOMTraversalTest.vcproj b/Projects/Win32/VC7.1/xerces-all/DOMTraversalTest/DOMTraversalTest.vcproj
index 67aef8e9d..98905091f 100644
--- a/Projects/Win32/VC7.1/xerces-all/DOMTraversalTest/DOMTraversalTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/DOMTraversalTest/DOMTraversalTest.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMTraversalTest.exe"
 				LinkIncremental="1"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMTraversalTest.exe"
 				LinkIncremental="2"
@@ -159,7 +159,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMTraversalTest.exe"
 				LinkIncremental="1"
@@ -218,7 +218,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMTraversalTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.vcproj b/Projects/Win32/VC7.1/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.vcproj
index a982de9e2..fb152f9c3 100644
--- a/Projects/Win32/VC7.1/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMTypeInfoTest.exe"
 				LinkIncremental="1"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMTypeInfoTest.exe"
 				LinkIncremental="2"
@@ -159,7 +159,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMTypeInfoTest.exe"
 				LinkIncremental="1"
@@ -218,7 +218,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMTypeInfoTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/EncodingTest/EncodingTest.vcproj b/Projects/Win32/VC7.1/xerces-all/EncodingTest/EncodingTest.vcproj
index 24633c58d..a22c1bc5e 100644
--- a/Projects/Win32/VC7.1/xerces-all/EncodingTest/EncodingTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/EncodingTest/EncodingTest.vcproj
@@ -37,7 +37,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\EncodingTest.exe"
 				LinkIncremental="1"
@@ -97,7 +97,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\EncodingTest.exe"
 				LinkIncremental="2"
@@ -155,7 +155,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\EncodingTest.exe"
 				LinkIncremental="1"
@@ -214,7 +214,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\EncodingTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/EnumVal/EnumVal.vcproj b/Projects/Win32/VC7.1/xerces-all/EnumVal/EnumVal.vcproj
index db2c30433..aeb655574 100644
--- a/Projects/Win32/VC7.1/xerces-all/EnumVal/EnumVal.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/EnumVal/EnumVal.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\EnumVal.exe"
 				LinkIncremental="1"
@@ -98,7 +98,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\EnumVal.exe"
 				LinkIncremental="2"
@@ -158,7 +158,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\EnumVal.exe"
 				LinkIncremental="1"
@@ -216,7 +216,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\EnumVal.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/InitTermTest/InitTermTest.vcproj b/Projects/Win32/VC7.1/xerces-all/InitTermTest/InitTermTest.vcproj
index 3b07161ca..864322f51 100644
--- a/Projects/Win32/VC7.1/xerces-all/InitTermTest/InitTermTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/InitTermTest/InitTermTest.vcproj
@@ -37,7 +37,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\InitTermTest.exe"
 				LinkIncremental="1"
@@ -97,7 +97,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\InitTermTest.exe"
 				LinkIncremental="2"
@@ -155,7 +155,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\InitTermTest.exe"
 				LinkIncremental="1"
@@ -214,7 +214,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\InitTermTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/MemHandlerTest/MemHandlerTest.vcproj b/Projects/Win32/VC7.1/xerces-all/MemHandlerTest/MemHandlerTest.vcproj
index e3a9ea9a4..c8202f403 100644
--- a/Projects/Win32/VC7.1/xerces-all/MemHandlerTest/MemHandlerTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/MemHandlerTest/MemHandlerTest.vcproj
@@ -37,7 +37,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\MemHandlerTest.exe"
 				Version="1.0"
@@ -98,7 +98,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\MemHandlerTest.exe"
 				LinkIncremental="2"
@@ -156,7 +156,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\MemHandlerTest.exe"
 				Version="1.0"
@@ -216,7 +216,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\MemHandlerTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/MemParse/MemParse.vcproj b/Projects/Win32/VC7.1/xerces-all/MemParse/MemParse.vcproj
index 10b65d7fd..4824a2319 100644
--- a/Projects/Win32/VC7.1/xerces-all/MemParse/MemParse.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/MemParse/MemParse.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\MemParse.exe"
 				LinkIncremental="1"
@@ -98,7 +98,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\MemParse.exe"
 				LinkIncremental="2"
@@ -158,7 +158,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\MemParse.exe"
 				LinkIncremental="1"
@@ -216,7 +216,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\MemParse.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/PParse/PParse.vcproj b/Projects/Win32/VC7.1/xerces-all/PParse/PParse.vcproj
index a2282f4d0..54d413f23 100644
--- a/Projects/Win32/VC7.1/xerces-all/PParse/PParse.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/PParse/PParse.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\PParse.exe"
 				LinkIncremental="1"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\PParse.exe"
 				LinkIncremental="2"
@@ -159,7 +159,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\PParse.exe"
 				LinkIncremental="1"
@@ -218,7 +218,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\PParse.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/PSVIWriter/PSVIWriter.vcproj b/Projects/Win32/VC7.1/xerces-all/PSVIWriter/PSVIWriter.vcproj
index dc88163a3..1a2e9fe67 100644
--- a/Projects/Win32/VC7.1/xerces-all/PSVIWriter/PSVIWriter.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/PSVIWriter/PSVIWriter.vcproj
@@ -38,7 +38,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\PSVIWriter.exe"
 				LinkIncremental="1"
@@ -97,7 +97,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\PSVIWriter.exe"
 				LinkIncremental="2"
@@ -156,7 +156,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\PSVIWriter.exe"
 				LinkIncremental="1"
@@ -214,7 +214,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\PSVIWriter.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/RangeTest/RangeTest.vcproj b/Projects/Win32/VC7.1/xerces-all/RangeTest/RangeTest.vcproj
index ae6bc4894..5f3e38b34 100644
--- a/Projects/Win32/VC7.1/xerces-all/RangeTest/RangeTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/RangeTest/RangeTest.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\RangeTest.exe"
 				LinkIncremental="1"
@@ -98,7 +98,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\RangeTest.exe"
 				LinkIncremental="2"
@@ -158,7 +158,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\RangeTest.exe"
 				LinkIncremental="1"
@@ -216,7 +216,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\RangeTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/Redirect/Redirect.vcproj b/Projects/Win32/VC7.1/xerces-all/Redirect/Redirect.vcproj
index 359db68aa..8d345503e 100644
--- a/Projects/Win32/VC7.1/xerces-all/Redirect/Redirect.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/Redirect/Redirect.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\Redirect.exe"
 				LinkIncremental="1"
@@ -98,7 +98,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\Redirect.exe"
 				LinkIncremental="2"
@@ -158,7 +158,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\Redirect.exe"
 				LinkIncremental="1"
@@ -216,7 +216,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\Redirect.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/SAX2Count/SAX2Count.vcproj b/Projects/Win32/VC7.1/xerces-all/SAX2Count/SAX2Count.vcproj
index 8ed49a250..e2c4b72a5 100644
--- a/Projects/Win32/VC7.1/xerces-all/SAX2Count/SAX2Count.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/SAX2Count/SAX2Count.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\SAX2Count.exe"
 				LinkIncremental="1"
@@ -98,7 +98,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\SAX2Count.exe"
 				LinkIncremental="2"
@@ -158,7 +158,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\SAX2Count.exe"
 				LinkIncremental="1"
@@ -216,7 +216,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\SAX2Count.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/SAX2Print/SAX2Print.vcproj b/Projects/Win32/VC7.1/xerces-all/SAX2Print/SAX2Print.vcproj
index d2211a33a..2795dda3a 100644
--- a/Projects/Win32/VC7.1/xerces-all/SAX2Print/SAX2Print.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/SAX2Print/SAX2Print.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\SAX2Print.exe"
 				LinkIncremental="1"
@@ -98,7 +98,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\SAX2Print.exe"
 				LinkIncremental="2"
@@ -158,7 +158,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\SAX2Print.exe"
 				LinkIncremental="1"
@@ -216,7 +216,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\SAX2Print.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/SAXCount/SAXCount.vcproj b/Projects/Win32/VC7.1/xerces-all/SAXCount/SAXCount.vcproj
index aa4936c62..c8892f957 100644
--- a/Projects/Win32/VC7.1/xerces-all/SAXCount/SAXCount.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/SAXCount/SAXCount.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\SAXCount.exe"
 				LinkIncremental="1"
@@ -98,7 +98,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\SAXCount.exe"
 				LinkIncremental="2"
@@ -158,7 +158,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\SAXCount.exe"
 				LinkIncremental="1"
@@ -216,7 +216,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\SAXCount.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/SAXPrint/SAXPrint.vcproj b/Projects/Win32/VC7.1/xerces-all/SAXPrint/SAXPrint.vcproj
index a2972c509..ceabf1c3d 100644
--- a/Projects/Win32/VC7.1/xerces-all/SAXPrint/SAXPrint.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/SAXPrint/SAXPrint.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\SAXPrint.exe"
 				LinkIncremental="1"
@@ -98,7 +98,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\SAXPrint.exe"
 				LinkIncremental="2"
@@ -158,7 +158,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\SAXPrint.exe"
 				LinkIncremental="1"
@@ -216,7 +216,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\SAXPrint.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/SCMPrint/SCMPrint.vcproj b/Projects/Win32/VC7.1/xerces-all/SCMPrint/SCMPrint.vcproj
index f4a4a5f89..103d0d2b2 100644
--- a/Projects/Win32/VC7.1/xerces-all/SCMPrint/SCMPrint.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/SCMPrint/SCMPrint.vcproj
@@ -37,7 +37,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\SCMPrint.exe"
 				LinkIncremental="1"
@@ -96,7 +96,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\SCMPrint.exe"
 				LinkIncremental="2"
@@ -154,7 +154,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\SCMPrint.exe"
 				LinkIncremental="1"
@@ -212,7 +212,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\SCMPrint.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj b/Projects/Win32/VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj
index 847883dea..533127fbe 100644
--- a/Projects/Win32/VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj
@@ -40,7 +40,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\SEnumVal.exe"
 				LinkIncremental="1"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\SEnumVal.exe"
 				LinkIncremental="2"
@@ -160,7 +160,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\SEnumVal.exe"
 				LinkIncremental="1"
@@ -218,7 +218,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\SEnumVal.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/StdInParse/StdInParse.vcproj b/Projects/Win32/VC7.1/xerces-all/StdInParse/StdInParse.vcproj
index 83b0b3840..3698082e1 100644
--- a/Projects/Win32/VC7.1/xerces-all/StdInParse/StdInParse.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/StdInParse/StdInParse.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\StdInParse.exe"
 				LinkIncremental="1"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\StdInParse.exe"
 				LinkIncremental="2"
@@ -159,7 +159,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\StdInParse.exe"
 				LinkIncremental="1"
@@ -218,7 +218,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\StdInParse.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/ThreadTest/ThreadTest.vcproj b/Projects/Win32/VC7.1/xerces-all/ThreadTest/ThreadTest.vcproj
index dbc16ec1c..109c9361c 100644
--- a/Projects/Win32/VC7.1/xerces-all/ThreadTest/ThreadTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/ThreadTest/ThreadTest.vcproj
@@ -37,7 +37,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\ThreadTest.exe"
 				LinkIncremental="1"
@@ -95,7 +95,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\ThreadTest.exe"
 				LinkIncremental="2"
@@ -153,7 +153,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\ThreadTest.exe"
 				LinkIncremental="1"
@@ -210,7 +210,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\ThreadTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/XInclude/XInclude.vcproj b/Projects/Win32/VC7.1/xerces-all/XInclude/XInclude.vcproj
index 2a988bf37..fc3dba2aa 100644
--- a/Projects/Win32/VC7.1/xerces-all/XInclude/XInclude.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/XInclude/XInclude.vcproj
@@ -38,7 +38,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\XInclude.exe"
 				LinkIncremental="1"
@@ -97,7 +97,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\XInclude.exe"
 				LinkIncremental="2"
@@ -156,7 +156,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\XInclude.exe"
 				LinkIncremental="1"
@@ -214,7 +214,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\XInclude.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/XSValueTest/XSValueTest.vcproj b/Projects/Win32/VC7.1/xerces-all/XSValueTest/XSValueTest.vcproj
index 02760c368..cff4e4b82 100644
--- a/Projects/Win32/VC7.1/xerces-all/XSValueTest/XSValueTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/XSValueTest/XSValueTest.vcproj
@@ -38,7 +38,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\XSValueTest.exe"
 				LinkIncremental="2"
@@ -96,7 +96,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\XSValueTest.exe"
 				LinkIncremental="1"
@@ -153,7 +153,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\XSValueTest.exe"
 				LinkIncremental="2"
@@ -211,7 +211,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\XSValueTest.exe"
 				LinkIncremental="1"
diff --git a/Projects/Win32/VC7.1/xerces-all/XSerializerTest/XSerializerTest.vcproj b/Projects/Win32/VC7.1/xerces-all/XSerializerTest/XSerializerTest.vcproj
index 3d52bafb1..733148139 100644
--- a/Projects/Win32/VC7.1/xerces-all/XSerializerTest/XSerializerTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/XSerializerTest/XSerializerTest.vcproj
@@ -37,7 +37,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\XSerializerTest.exe"
 				LinkIncremental="1"
@@ -95,7 +95,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\XSerializerTest.exe"
 				LinkIncremental="2"
@@ -153,7 +153,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\XSerializerTest.exe"
 				LinkIncremental="1"
@@ -210,7 +210,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\XSerializerTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj b/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
index 8253d941c..4d61d3319 100644
--- a/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="ws2_32.lib advapi32.lib "
 				OutputFile="$(OutDir)\xerces-c_3_0.dll"
 				LinkIncremental="0"
@@ -109,7 +109,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="ws2_32.lib advapi32.lib "
 				OutputFile="$(OutDir)\xerces-c_3_0D.dll"
 				LinkIncremental="0"
diff --git a/Projects/Win32/VC7.1/xerces-all/xerces-com/xerces-com.vcproj b/Projects/Win32/VC7.1/xerces-all/xerces-com/xerces-com.vcproj
index dfa125bd5..243cf3df4 100644
--- a/Projects/Win32/VC7.1/xerces-all/xerces-com/xerces-com.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/xerces-com/xerces-com.vcproj
@@ -48,7 +48,7 @@ echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
 				Outputs="$(OutDir)\regsvr32.trg"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="wininet.lib shlwapi.lib xerces-c_3.lib"
 				OutputFile="$(OutDir)\xerces-com.dll"
 				LinkIncremental="1"
@@ -116,7 +116,7 @@ echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
 				Outputs="$(OutDir)\regsvr32.trg"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="wininet.lib shlwapi.lib xerces-c_3D.lib"
 				OutputFile="$(OutDir)\xerces-com.dll"
 				LinkIncremental="2"
@@ -186,7 +186,7 @@ echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
 				Outputs="$(OutDir)\regsvr32.trg"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="wininet.lib shlwapi.lib xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\xerces-com.dll"
 				LinkIncremental="1"
@@ -253,7 +253,7 @@ echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
 				Outputs="$(OutDir)\regsvr32.trg"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="wininet.lib shlwapi.lib xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\xerces-com.dll"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/CreateDOMDocument/CreateDOMDocument.vcproj b/Projects/Win32/VC8/xerces-all/CreateDOMDocument/CreateDOMDocument.vcproj
index e6ef80325..989e5044b 100644
--- a/Projects/Win32/VC8/xerces-all/CreateDOMDocument/CreateDOMDocument.vcproj
+++ b/Projects/Win32/VC8/xerces-all/CreateDOMDocument/CreateDOMDocument.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="CreateDOMDocument"
 	ProjectGUID="{8709DC2A-0EC9-4B67-9E98-95D5174B2C3F}"
 	RootNamespace="CreateDOMDocument"
@@ -71,7 +71,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\CreateDOMDocument.exe"
 				LinkIncremental="1"
@@ -105,8 +105,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -127,22 +127,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\CreateDOMDocument.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="_CONSOLE;WIN64;NDEBUG;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\CreateDOMDocument.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\CreateDOMDocument_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -150,7 +151,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -158,14 +159,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\CreateDOMDocument.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\CreateDOMDocument.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -193,7 +193,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -219,18 +219,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CONSOLE;WIN32;NDEBUG;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\CreateDOMDocument.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\CreateDOMDocument_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -238,7 +238,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -246,11 +246,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\CreateDOMDocument.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\CreateDOMDocument.pdb"
 				SubSystem="1"
 			/>
@@ -280,8 +281,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -302,21 +303,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\CreateDOMDocument.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG;_WINDOWS;XERCES_STATIC_LIBRARY"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="_CONSOLE;WIN64;_DEBUG;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\CreateDOMDocument.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\CreateDOMDocument_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -332,14 +335,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\CreateDOMDocument.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\CreateDOMDocument.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -367,8 +370,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -389,16 +392,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\CreateDOMDocument.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CONSOLE;WIN64;NDEBUG;_WINDOWS"
+				PreprocessorDefinitions="_CONSOLE;WIN32;NDEBUG;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\CreateDOMDocument.pch"
@@ -421,14 +423,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\CreateDOMDocument.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\CreateDOMDocument.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -456,7 +457,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -483,18 +484,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CONSOLE;WIN64;_DEBUG;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="_CONSOLE;WIN64;NDEBUG;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\CreateDOMDocument.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\CreateDOMDocument_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -502,7 +503,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -510,12 +511,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\CreateDOMDocument.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\CreateDOMDocument.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -546,8 +545,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -568,23 +567,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\CreateDOMDocument.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CONSOLE;WIN64;NDEBUG;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG;_WINDOWS;XERCES_STATIC_LIBRARY"
+				RuntimeLibrary="1"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\CreateDOMDocument.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\CreateDOMDocument_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -592,7 +589,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -600,14 +597,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\CreateDOMDocument.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\CreateDOMDocument.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -688,7 +685,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\CreateDOMDocument.exe"
 				LinkIncremental="2"
@@ -739,7 +735,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|Win32"
+				Name="Release|x64"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -747,7 +743,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Static Release|Win32"
+				Name="Debug|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -755,7 +751,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Static Debug|Win32"
+				Name="Debug|x64"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -763,7 +759,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release|x64"
+				Name="Static Release|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -771,7 +767,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|x64"
+				Name="Static Release|x64"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -779,7 +775,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Static Release|x64"
+				Name="Static Debug|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
diff --git a/Projects/Win32/VC8/xerces-all/DOMCount/DOMCount.vcproj b/Projects/Win32/VC8/xerces-all/DOMCount/DOMCount.vcproj
index fada2f4db..790242f7f 100644
--- a/Projects/Win32/VC8/xerces-all/DOMCount/DOMCount.vcproj
+++ b/Projects/Win32/VC8/xerces-all/DOMCount/DOMCount.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="DOMCount"
 	ProjectGUID="{60E3008A-0D78-4B25-A12E-9D7A3921F67C}"
 	>
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMCount.exe"
 				LinkIncremental="1"
@@ -104,8 +104,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -126,21 +126,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMCount.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CONSOLE;WIN32;_DEBUG;_WINDOWS"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CONSOLE;WIN64;NDEBUG;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMCount.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMCount_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -148,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -156,14 +158,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMCount.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMCount.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -191,7 +192,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -217,18 +218,17 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CONSOLE;WIN32;NDEBUG;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CONSOLE;WIN32;_DEBUG;_WINDOWS"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMCount.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMCount_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -236,7 +236,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -244,11 +244,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMCount.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMCount.pdb"
 				SubSystem="1"
 			/>
@@ -278,8 +279,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -300,20 +301,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMCount.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CONSOLE;WIN32;_DEBUG;_WINDOWS;XERCES_STATIC_LIBRARY"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CONSOLE;WIN64;_DEBUG;_WINDOWS"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMCount.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMCount_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -329,14 +332,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMCount.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMCount.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -364,8 +367,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -386,16 +389,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMCount.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CONSOLE;WIN64;NDEBUG;_WINDOWS"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CONSOLE;WIN32;NDEBUG;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMCount.pch"
@@ -418,14 +420,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMCount.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\DOMCount.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -453,7 +454,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -480,17 +481,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CONSOLE;WIN64;_DEBUG;_WINDOWS"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CONSOLE;WIN64;NDEBUG;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMCount.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMCount_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -498,7 +500,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -506,12 +508,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMCount.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMCount.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -542,8 +542,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -564,23 +564,20 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMCount.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CONSOLE;WIN64;NDEBUG;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CONSOLE;WIN32;_DEBUG;_WINDOWS;XERCES_STATIC_LIBRARY"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="$(IntDir)\DOMCount.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMCount_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -588,7 +585,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -596,14 +593,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMCount.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMCount.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -683,7 +680,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMCount.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/DOMMemTest/DOMMemTest.vcproj b/Projects/Win32/VC8/xerces-all/DOMMemTest/DOMMemTest.vcproj
index 9790b652e..1b44e9e78 100644
--- a/Projects/Win32/VC8/xerces-all/DOMMemTest/DOMMemTest.vcproj
+++ b/Projects/Win32/VC8/xerces-all/DOMMemTest/DOMMemTest.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="DOMMemTest"
 	ProjectGUID="{0D9CB6CF-DB0B-495D-B674-8FC3DD3C12C2}"
 	RootNamespace="DOMMemTest"
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMMemTest.exe"
 				LinkIncremental="1"
@@ -104,8 +104,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -126,23 +126,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMMemTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMMemTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMMemTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -150,7 +149,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -158,14 +157,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMMemTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMMemTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -193,7 +191,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -219,17 +217,19 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMMemTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMMemTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -237,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -245,11 +245,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMMemTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMMemTest.pdb"
 				SubSystem="1"
 			/>
@@ -279,8 +280,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -301,22 +302,24 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMMemTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN64;_WINDOWS"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMMemTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMMemTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -332,14 +335,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMMemTest.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMMemTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -367,8 +370,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -389,16 +392,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMMemTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMMemTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
@@ -420,14 +422,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMMemTest.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\DOMMemTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -455,7 +456,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -482,19 +483,17 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMMemTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMMemTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -502,7 +501,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -510,12 +509,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMMemTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMMemTest.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -546,8 +543,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -568,22 +565,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMMemTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMMemTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMMemTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -591,7 +588,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -599,14 +596,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMMemTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMMemTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -688,7 +685,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMMemTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj b/Projects/Win32/VC8/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj
index 1b6596680..6c22b7181 100644
--- a/Projects/Win32/VC8/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj
+++ b/Projects/Win32/VC8/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="DOMNormalizerTest"
 	ProjectGUID="{BE9C14B1-2301-4C62-85E2-B583D22AE29C}"
 	>
@@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMNormalizerTest.exe"
 				LinkIncremental="1"
@@ -103,8 +103,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -125,23 +125,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMNormalizerTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMNormalizerTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMNormalizer_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -149,7 +148,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -157,14 +156,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMNormalizerTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMNormalizerTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -192,7 +190,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -218,17 +216,19 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMNormalizerTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMNormalizer_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -236,7 +236,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -244,11 +244,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMNormalizerTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMNormalizerTest.pdb"
 				SubSystem="1"
 			/>
@@ -278,8 +279,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -300,22 +301,24 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMNormalizerTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMNormalizerTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMNormalizer_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -331,14 +334,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMNormalizerTest.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMNormalizerTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -366,8 +369,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -388,16 +391,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMNormalizerTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMNormalizerTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
@@ -419,14 +421,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMNormalizerTest.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\DOMNormalizerTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -454,7 +455,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -481,19 +482,17 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMNormalizerTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMNormalizer_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -501,7 +500,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -509,12 +508,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMNormalizerTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMNormalizerTest.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -545,8 +542,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -567,22 +564,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMNormalizerTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMNormalizerTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMNormalizer_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -590,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -598,14 +595,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMNormalizerTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMNormalizerTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -687,7 +684,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMNormalizerTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/DOMPrint/DOMPrint.vcproj b/Projects/Win32/VC8/xerces-all/DOMPrint/DOMPrint.vcproj
index 6b270e470..84206b7bb 100644
--- a/Projects/Win32/VC8/xerces-all/DOMPrint/DOMPrint.vcproj
+++ b/Projects/Win32/VC8/xerces-all/DOMPrint/DOMPrint.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="DOMPrint"
 	ProjectGUID="{056463A8-AEDD-4B92-BC24-C0C154C0379C}"
 	>
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMPrint.exe"
 				LinkIncremental="1"
@@ -104,8 +104,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -126,22 +126,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMPrint.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMPrint.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMPrint_vc80"
+				BrowseInformation="0"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -149,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -157,14 +158,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMPrint.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMPrint.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -192,7 +192,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -218,18 +218,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				RuntimeLibrary="3"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMPrint.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMPrint_vc80"
-				BrowseInformation="0"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -237,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -245,11 +245,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMPrint.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMPrint.pdb"
 				SubSystem="1"
 			/>
@@ -279,8 +280,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -301,21 +302,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMPrint.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMPrint.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMPrint_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -331,14 +334,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMPrint.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMPrint.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -366,8 +369,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -388,16 +391,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMPrint.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMPrint.pch"
 				AssemblerListingLocation="$(IntDir)\"
@@ -420,14 +422,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMPrint.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\DOMPrint.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -455,7 +456,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -482,18 +483,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMPrint.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMPrint_vc80"
+				BrowseInformation="0"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -501,7 +502,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -509,12 +510,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMPrint.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMPrint.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -545,8 +544,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -567,23 +566,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMPrint.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				RuntimeLibrary="1"
+				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMPrint.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMPrint_vc80"
-				BrowseInformation="0"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -591,7 +588,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -599,14 +596,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMPrint.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMPrint.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -687,7 +684,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMPrint.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/DOMTest/DOMTest.vcproj b/Projects/Win32/VC8/xerces-all/DOMTest/DOMTest.vcproj
index a32af9364..e68b42118 100644
--- a/Projects/Win32/VC8/xerces-all/DOMTest/DOMTest.vcproj
+++ b/Projects/Win32/VC8/xerces-all/DOMTest/DOMTest.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="DOMTest"
 	ProjectGUID="{3C777DB7-42D1-4AA6-A051-24213E411891}"
 	>
@@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMTest.exe"
 				LinkIncremental="1"
@@ -103,8 +103,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -125,23 +125,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -149,7 +148,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -157,14 +156,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -192,7 +190,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -218,17 +216,19 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -236,7 +236,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -244,11 +244,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMTest.pdb"
 				SubSystem="1"
 			/>
@@ -278,8 +279,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -300,22 +301,24 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -331,14 +334,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMTest.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -366,8 +369,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -388,16 +391,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
@@ -419,14 +421,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMTest.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\DOMTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -454,7 +455,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -481,19 +482,17 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -501,7 +500,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -509,12 +508,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMTest.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -545,8 +542,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -567,22 +564,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -590,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -598,14 +595,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -687,7 +684,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/DOMTraversalTest/DOMTraversalTest.vcproj b/Projects/Win32/VC8/xerces-all/DOMTraversalTest/DOMTraversalTest.vcproj
index 6991537ff..b8e7b9002 100644
--- a/Projects/Win32/VC8/xerces-all/DOMTraversalTest/DOMTraversalTest.vcproj
+++ b/Projects/Win32/VC8/xerces-all/DOMTraversalTest/DOMTraversalTest.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="DOMTraversalTest"
 	ProjectGUID="{DFC196B9-2146-4CDA-AC0A-632BD38FA41D}"
 	>
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMTraversalTest.exe"
 				LinkIncremental="1"
@@ -104,8 +104,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -126,23 +126,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMTraversalTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMTraversalTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMTraversalTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -150,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -158,14 +158,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMTraversalTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMTraversalTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -193,7 +192,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -219,18 +218,19 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMTraversalTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMTraversalTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -238,7 +238,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -246,11 +246,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMTraversalTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMTraversalTest.pdb"
 				SubSystem="1"
 			/>
@@ -280,8 +281,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -302,22 +303,24 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMTraversalTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMTraversalTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMTraversalTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -333,14 +336,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMTraversalTest.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMTraversalTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -368,8 +371,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -390,16 +393,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMTraversalTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMTraversalTest.pch"
@@ -422,14 +424,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMTraversalTest.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\DOMTraversalTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -457,7 +458,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -484,19 +485,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMTraversalTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMTraversalTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -504,7 +504,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -512,12 +512,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMTraversalTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMTraversalTest.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -548,8 +546,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -570,23 +568,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMTraversalTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMTraversalTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMTraversalTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -594,7 +591,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -602,14 +599,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMTraversalTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMTraversalTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -691,7 +688,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMTraversalTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.vcproj b/Projects/Win32/VC8/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.vcproj
index 40b561f69..589f193a3 100644
--- a/Projects/Win32/VC8/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.vcproj
+++ b/Projects/Win32/VC8/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="DOMTypeInfoTest"
 	ProjectGUID="{15A10DF2-F551-4306-A4CC-690F58C58081}"
 	>
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMTypeInfoTest.exe"
 				LinkIncremental="1"
@@ -104,8 +104,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -126,23 +126,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMTypeInfoTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMTypeInfoTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMTypeInfoTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -150,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -158,14 +158,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\DOMTypeInfoTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMTypeInfoTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -193,7 +192,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -219,18 +218,19 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMTypeInfoTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMTypeInfoTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -238,7 +238,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -246,11 +246,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMTypeInfoTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMTypeInfoTest.pdb"
 				SubSystem="1"
 			/>
@@ -280,8 +281,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -302,22 +303,24 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMTypeInfoTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMTypeInfoTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMTypeInfoTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -333,14 +336,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\DOMTypeInfoTest.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMTypeInfoTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -368,8 +371,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -390,16 +393,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMTypeInfoTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMTypeInfoTest.pch"
@@ -422,14 +424,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMTypeInfoTest.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\DOMTypeInfoTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -457,7 +458,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -484,19 +485,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMTypeInfoTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMTypeInfoTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -504,7 +504,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -512,12 +512,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\DOMTypeInfoTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMTypeInfoTest.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -548,8 +546,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -570,23 +568,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\DOMTypeInfoTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\DOMTypeInfoTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\DOMTypeInfoTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -594,7 +591,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -602,14 +599,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMTypeInfoTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\DOMTypeInfoTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -691,7 +688,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\DOMTypeInfoTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/EncodingTest/EncodingTest.vcproj b/Projects/Win32/VC8/xerces-all/EncodingTest/EncodingTest.vcproj
index 7c6468392..bb78c0a71 100644
--- a/Projects/Win32/VC8/xerces-all/EncodingTest/EncodingTest.vcproj
+++ b/Projects/Win32/VC8/xerces-all/EncodingTest/EncodingTest.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="EncodingTest"
 	ProjectGUID="{B8B50FE7-B620-4D19-A147-B167D087DD53}"
 	>
@@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\EncodingTest.exe"
 				LinkIncremental="1"
@@ -103,8 +103,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -125,23 +125,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\EncodingTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\EncodingTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\EncodingTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -149,7 +148,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -157,14 +156,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\EncodingTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\EncodingTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -192,7 +190,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -218,17 +216,19 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\EncodingTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\EncodingTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -236,7 +236,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -244,11 +244,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\EncodingTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\EncodingTest.pdb"
 				SubSystem="1"
 			/>
@@ -278,8 +279,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -300,22 +301,24 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\EncodingTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\EncodingTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\EncodingTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -331,14 +334,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\EncodingTest.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\EncodingTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -366,8 +369,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -388,16 +391,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\EncodingTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\EncodingTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
@@ -419,14 +421,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\EncodingTest.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\EncodingTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -454,7 +455,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -481,19 +482,17 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\EncodingTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\EncodingTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -501,7 +500,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -509,12 +508,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\EncodingTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\EncodingTest.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -545,8 +542,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -567,22 +564,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\EncodingTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\EncodingTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\EncodingTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -590,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -598,14 +595,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\EncodingTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\EncodingTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -687,7 +684,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\EncodingTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/EnumVal/EnumVal.vcproj b/Projects/Win32/VC8/xerces-all/EnumVal/EnumVal.vcproj
index a5b3f7175..4b8a8885a 100644
--- a/Projects/Win32/VC8/xerces-all/EnumVal/EnumVal.vcproj
+++ b/Projects/Win32/VC8/xerces-all/EnumVal/EnumVal.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="EnumVal"
 	ProjectGUID="{26A4FA00-DB6E-43FA-83D4-0FC3A5472A27}"
 	>
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\EnumVal.exe"
 				LinkIncremental="1"
@@ -104,8 +104,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -126,22 +126,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\EnumVal.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\EnumVal.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\EnumVal_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -149,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -157,14 +158,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\EnumVal.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\EnumVal.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -192,7 +192,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -218,18 +218,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\EnumVal.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\EnumVal_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -237,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -245,11 +245,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\EnumVal.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\EnumVal.pdb"
 				SubSystem="1"
 			/>
@@ -279,8 +280,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -301,21 +302,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\EnumVal.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\EnumVal.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\EnumVal_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -331,14 +334,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\EnumVal.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\EnumVal.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -366,8 +369,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -388,16 +391,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\EnumVal.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\EnumVal.pch"
@@ -420,14 +422,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\EnumVal.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\EnumVal.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -455,7 +456,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -482,18 +483,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\EnumVal.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\EnumVal_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -501,7 +502,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -509,12 +510,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\EnumVal.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\EnumVal.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -545,8 +545,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -567,23 +567,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\EnumVal.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				RuntimeLibrary="1"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\EnumVal.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\EnumVal_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -591,7 +589,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -599,14 +597,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\EnumVal.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\EnumVal.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -687,7 +685,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\EnumVal.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/InitTermTest/InitTermTest.vcproj b/Projects/Win32/VC8/xerces-all/InitTermTest/InitTermTest.vcproj
index 6b3413bf1..bc1b4b108 100644
--- a/Projects/Win32/VC8/xerces-all/InitTermTest/InitTermTest.vcproj
+++ b/Projects/Win32/VC8/xerces-all/InitTermTest/InitTermTest.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="InitTermTest"
 	ProjectGUID="{2682B2AB-E341-4528-85AB-BE95DE77A9BC}"
 	>
@@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\InitTermTest.exe"
 				LinkIncremental="1"
@@ -103,8 +103,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -125,23 +125,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\InitTermTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\InitTermTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\InitTermTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -149,7 +148,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -157,14 +156,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\InitTermTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\InitTermTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -192,7 +190,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -218,17 +216,19 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\InitTermTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\InitTermTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -236,7 +236,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -244,11 +244,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\InitTermTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\InitTermTest.pdb"
 				SubSystem="1"
 			/>
@@ -278,8 +279,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -300,22 +301,24 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\InitTermTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\InitTermTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\InitTermTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -331,14 +334,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\InitTermTest.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\InitTermTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -366,8 +369,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -388,16 +391,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\InitTermTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\InitTermTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
@@ -419,14 +421,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\InitTermTest.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\InitTermTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -454,7 +455,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -481,19 +482,17 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\InitTermTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\InitTermTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -501,7 +500,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -509,12 +508,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\InitTermTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\InitTermTest.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -545,8 +543,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -567,22 +565,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\InitTermTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\InitTermTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\InitTermTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -590,7 +588,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -598,14 +596,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\InitTermTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\InitTermTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -687,7 +685,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\InitTermTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/MemHandlerTest/MemHandlerTest.vcproj b/Projects/Win32/VC8/xerces-all/MemHandlerTest/MemHandlerTest.vcproj
index 9b9485efe..29696003f 100644
--- a/Projects/Win32/VC8/xerces-all/MemHandlerTest/MemHandlerTest.vcproj
+++ b/Projects/Win32/VC8/xerces-all/MemHandlerTest/MemHandlerTest.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="MemHandlerTest"
 	ProjectGUID="{160AC448-AD35-4FA9-8C4D-FF46A0E5BE5D}"
 	>
@@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\MemHandlerTest.exe"
 				Version=""
@@ -104,8 +104,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -126,23 +126,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\MemHandlerTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\MemHandlerTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\MemHandlerTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -150,7 +149,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -158,14 +157,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\MemHandlerTest.exe"
-				LinkIncremental="2"
+				Version=""
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\MemHandlerTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -193,7 +192,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -219,17 +218,19 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\MemHandlerTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\MemHandlerTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -237,7 +238,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -245,12 +246,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\MemHandlerTest.exe"
-				Version=""
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\MemHandlerTest.pdb"
 				SubSystem="1"
 			/>
@@ -280,8 +281,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -302,22 +303,24 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\MemHandlerTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\MemHandlerTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\MemHandlerTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -333,14 +336,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\MemHandlerTest.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\MemHandlerTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -368,8 +371,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -390,16 +393,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\MemHandlerTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\MemHandlerTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
@@ -421,15 +423,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\MemHandlerTest.exe"
 				Version=""
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\MemHandlerTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -457,7 +458,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -484,19 +485,17 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\MemHandlerTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\MemHandlerTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -504,7 +503,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -512,12 +511,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\MemHandlerTest.exe"
-				LinkIncremental="2"
+				Version=""
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\MemHandlerTest.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -548,8 +547,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -570,22 +569,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\MemHandlerTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\MemHandlerTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\MemHandlerTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -593,7 +592,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -601,15 +600,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\MemHandlerTest.exe"
-				Version=""
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\MemHandlerTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -691,7 +689,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\MemHandlerTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/MemParse/MemParse.vcproj b/Projects/Win32/VC8/xerces-all/MemParse/MemParse.vcproj
index bc1bc8547..d6b28d2a7 100644
--- a/Projects/Win32/VC8/xerces-all/MemParse/MemParse.vcproj
+++ b/Projects/Win32/VC8/xerces-all/MemParse/MemParse.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="MemParse"
 	ProjectGUID="{6F412978-851F-494D-8C3D-DF97A515EDF5}"
 	>
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\MemParse.exe"
 				LinkIncremental="1"
@@ -104,8 +104,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -126,22 +126,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\MemParse.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\MemParse.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\MemParse_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -149,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -157,14 +158,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\MemParse.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\MemParse.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -192,7 +192,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -218,18 +218,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\MemParse.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\MemParse_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -237,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -245,11 +245,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\MemParse.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\MemParse.pdb"
 				SubSystem="1"
 			/>
@@ -279,8 +280,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -301,21 +302,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\MemParse.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\MemParse.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\MemParse_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -331,14 +334,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\MemParse.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\MemParse.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -366,8 +369,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -388,16 +391,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\MemParse.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\MemParse.pch"
@@ -420,14 +422,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\MemParse.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\MemParse.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -455,7 +456,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -482,18 +483,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\MemParse.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\MemParse_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -501,7 +502,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -509,12 +510,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\MemParse.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\MemParse.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -545,8 +545,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -567,23 +567,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\MemParse.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				RuntimeLibrary="1"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\MemParse.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\MemParse_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -591,7 +589,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -599,14 +597,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\MemParse.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\MemParse.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -687,7 +685,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\MemParse.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/PParse/PParse.vcproj b/Projects/Win32/VC8/xerces-all/PParse/PParse.vcproj
index 54ff31c4f..a08558b28 100644
--- a/Projects/Win32/VC8/xerces-all/PParse/PParse.vcproj
+++ b/Projects/Win32/VC8/xerces-all/PParse/PParse.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="PParse"
 	ProjectGUID="{65BE6CCA-6F7F-4DB9-A6FD-C220E9FE87AD}"
 	>
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\PParse.exe"
 				LinkIncremental="1"
@@ -104,8 +104,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -126,23 +126,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\PParse.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\PParse.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\PParse_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -150,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -158,14 +158,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\PParse.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\PParse.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -193,7 +192,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -219,18 +218,19 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\PParse.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\PParse_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -238,7 +238,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -246,11 +246,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\PParse.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\PParse.pdb"
 				SubSystem="1"
 			/>
@@ -280,8 +281,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -302,22 +303,24 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\PParse.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\PParse.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\PParse_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -333,14 +336,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\PParse.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\PParse.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -368,8 +371,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -390,16 +393,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\PParse.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\PParse.pch"
@@ -422,14 +424,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\PParse.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\PParse.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -457,7 +458,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -484,19 +485,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\PParse.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\PParse_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -504,7 +504,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -512,12 +512,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\PParse.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\PParse.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -548,8 +547,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -570,23 +569,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\PParse.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\PParse.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\PParse_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -594,7 +592,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -602,14 +600,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\PParse.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\PParse.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -691,7 +689,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\PParse.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/PSVIWriter/PSVIWriter.vcproj b/Projects/Win32/VC8/xerces-all/PSVIWriter/PSVIWriter.vcproj
index e0de93649..82edd1064 100644
--- a/Projects/Win32/VC8/xerces-all/PSVIWriter/PSVIWriter.vcproj
+++ b/Projects/Win32/VC8/xerces-all/PSVIWriter/PSVIWriter.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="PSVIWriter"
 	ProjectGUID="{FB7E86DB-9557-4044-8FF7-A9131BB021E6}"
 	>
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\PSVIWriter.exe"
 				LinkIncremental="1"
@@ -104,8 +104,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -126,22 +126,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\PSVIWriter.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CONSOLE;_DEBUG;WIN32;_WINDOWS"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\PSVIWriter.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\PSVIWriter_vc80"
+				BrowseInformation="0"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -149,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -157,14 +158,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\PSVIWriter.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\PSVIWriter.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -192,7 +192,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -218,18 +218,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CONSOLE;_DEBUG;WIN32;_WINDOWS"
+				RuntimeLibrary="3"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\PSVIWriter.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\PSVIWriter_vc80"
-				BrowseInformation="0"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -237,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -245,11 +245,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\PSVIWriter.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\PSVIWriter.pdb"
 				SubSystem="1"
 			/>
@@ -279,8 +280,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -301,21 +302,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\PSVIWriter.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CONSOLE;_DEBUG;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CONSOLE;_DEBUG;WIN64;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\PSVIWriter.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\PSVIWriter_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -331,14 +334,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\PSVIWriter.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\PSVIWriter.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -366,8 +369,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -388,16 +391,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\PSVIWriter.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\PSVIWriter.pch"
 				AssemblerListingLocation="$(IntDir)\"
@@ -420,14 +422,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\PSVIWriter.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\PSVIWriter.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -455,7 +456,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -482,18 +483,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CONSOLE;_DEBUG;WIN64;_WINDOWS"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\PSVIWriter.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\PSVIWriter_vc80"
+				BrowseInformation="0"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -501,7 +502,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -509,12 +510,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\PSVIWriter.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\PSVIWriter.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -545,8 +545,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -567,23 +567,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\PSVIWriter.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CONSOLE;_DEBUG;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				RuntimeLibrary="1"
+				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\PSVIWriter.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\PSVIWriter_vc80"
-				BrowseInformation="0"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -591,7 +589,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -599,14 +597,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\PSVIWriter.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\PSVIWriter.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -687,7 +685,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\PSVIWriter.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/RangeTest/RangeTest.vcproj b/Projects/Win32/VC8/xerces-all/RangeTest/RangeTest.vcproj
index 6f835c2d1..f381c9b3e 100644
--- a/Projects/Win32/VC8/xerces-all/RangeTest/RangeTest.vcproj
+++ b/Projects/Win32/VC8/xerces-all/RangeTest/RangeTest.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="RangeTest"
 	ProjectGUID="{BBD46C34-DEA0-42AB-96AB-E87C6371A6C2}"
 	>
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\RangeTest.exe"
 				LinkIncremental="1"
@@ -104,8 +104,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -126,22 +126,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\RangeTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="_CONSOLE;WIN64;NDEBUG;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\RangeTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\RangeTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -149,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -157,14 +158,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\RangeTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\RangeTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -192,7 +192,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -218,18 +218,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CONSOLE;WIN32;NDEBUG;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\RangeTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\RangeTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -237,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -245,11 +245,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\RangeTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\RangeTest.pdb"
 				SubSystem="1"
 			/>
@@ -279,8 +280,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -301,21 +302,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\RangeTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG;_WINDOWS;XERCES_STATIC_LIBRARY"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="_CONSOLE;WIN64;_DEBUG;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\RangeTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\RangeTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -331,14 +334,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\RangeTest.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\RangeTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -366,8 +369,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -388,16 +391,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\RangeTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CONSOLE;WIN64;NDEBUG;_WINDOWS"
+				PreprocessorDefinitions="_CONSOLE;WIN32;NDEBUG;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\RangeTest.pch"
@@ -420,14 +422,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\RangeTest.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\RangeTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -455,7 +456,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -482,18 +483,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CONSOLE;WIN64;_DEBUG;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="_CONSOLE;WIN64;NDEBUG;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\RangeTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\RangeTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -501,7 +502,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -509,12 +510,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\RangeTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\RangeTest.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -545,8 +545,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -567,23 +567,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\RangeTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CONSOLE;WIN64;NDEBUG;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG;_WINDOWS;XERCES_STATIC_LIBRARY"
+				RuntimeLibrary="1"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\RangeTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\RangeTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -591,7 +589,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -599,14 +597,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\RangeTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\RangeTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -687,7 +685,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\RangeTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/Redirect/Redirect.vcproj b/Projects/Win32/VC8/xerces-all/Redirect/Redirect.vcproj
index 479617f0b..911757d52 100644
--- a/Projects/Win32/VC8/xerces-all/Redirect/Redirect.vcproj
+++ b/Projects/Win32/VC8/xerces-all/Redirect/Redirect.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="Redirect"
 	ProjectGUID="{569D5A1E-C582-40B7-8BFC-FC7B5D4DDA75}"
 	>
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\Redirect.exe"
 				LinkIncremental="1"
@@ -104,8 +104,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -126,22 +126,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\Redirect.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\Redirect.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\Redirect_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -149,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -157,14 +158,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\Redirect.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\Redirect.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -192,7 +192,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -218,18 +218,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\Redirect.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\Redirect_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -237,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -245,11 +245,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\Redirect.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\Redirect.pdb"
 				SubSystem="1"
 			/>
@@ -279,8 +280,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -301,21 +302,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\Redirect.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\Redirect.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\Redirect_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -331,14 +334,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\Redirect.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\Redirect.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -366,8 +369,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -388,16 +391,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\Redirect.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\Redirect.pch"
@@ -420,14 +422,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\Redirect.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\Redirect.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -455,7 +456,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -482,18 +483,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\Redirect.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\Redirect_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -501,7 +502,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -509,12 +510,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\Redirect.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\Redirect.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -545,8 +545,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -567,23 +567,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\Redirect.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				RuntimeLibrary="1"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\Redirect.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\Redirect_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -591,7 +589,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -599,14 +597,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\Redirect.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\Redirect.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -687,7 +685,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\Redirect.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/SAX2Count/SAX2Count.vcproj b/Projects/Win32/VC8/xerces-all/SAX2Count/SAX2Count.vcproj
index 8f7f49d1a..ded114da2 100644
--- a/Projects/Win32/VC8/xerces-all/SAX2Count/SAX2Count.vcproj
+++ b/Projects/Win32/VC8/xerces-all/SAX2Count/SAX2Count.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="SAX2Count"
 	ProjectGUID="{FB794093-CA26-4DBF-A7DF-1A62B7C872D5}"
 	>
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\SAX2Count.exe"
 				LinkIncremental="1"
@@ -104,8 +104,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -126,22 +126,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SAX2Count.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SAX2Count.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAX2Count_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -149,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -157,14 +158,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\SAX2Count.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAX2Count.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -192,7 +192,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -218,18 +218,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SAX2Count.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAX2Count_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -237,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -245,11 +245,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\SAX2Count.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAX2Count.pdb"
 				SubSystem="1"
 			/>
@@ -279,8 +280,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -301,21 +302,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SAX2Count.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN64;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SAX2Count.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAX2Count_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -331,14 +334,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\SAX2Count.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAX2Count.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -366,8 +369,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -388,16 +391,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SAX2Count.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\SAX2Count.pch"
@@ -420,14 +422,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\SAX2Count.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\SAX2Count.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -455,7 +456,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -482,18 +483,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SAX2Count.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAX2Count_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -501,7 +502,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -509,12 +510,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\SAX2Count.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAX2Count.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -545,8 +545,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -567,23 +567,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SAX2Count.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				RuntimeLibrary="1"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\SAX2Count.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAX2Count_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -591,7 +589,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -599,14 +597,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\SAX2Count.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAX2Count.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -687,7 +685,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\SAX2Count.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/SAX2Print/SAX2Print.vcproj b/Projects/Win32/VC8/xerces-all/SAX2Print/SAX2Print.vcproj
index 8a121d992..442980fde 100644
--- a/Projects/Win32/VC8/xerces-all/SAX2Print/SAX2Print.vcproj
+++ b/Projects/Win32/VC8/xerces-all/SAX2Print/SAX2Print.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="SAX2Print"
 	ProjectGUID="{7259B5D2-54FE-4142-9321-0572C615F0A2}"
 	>
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\SAX2Print.exe"
 				LinkIncremental="1"
@@ -104,8 +104,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -126,22 +126,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SAX2Print.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SAX2Print.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAX2Print_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -149,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -157,14 +158,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\SAX2Print.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAX2Print.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -192,7 +192,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -218,18 +218,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SAX2Print.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAX2Print_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -237,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -245,11 +245,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\SAX2Print.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAX2Print.pdb"
 				SubSystem="1"
 			/>
@@ -279,8 +280,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -301,21 +302,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SAX2Print.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SAX2Print.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAX2Print_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -331,14 +334,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\SAX2Print.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAX2Print.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -366,8 +369,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -388,16 +391,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SAX2Print.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\SAX2Print.pch"
@@ -420,14 +422,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\SAX2Print.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\SAX2Print.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -455,7 +456,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -482,18 +483,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SAX2Print.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAX2Print_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -501,7 +502,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -509,12 +510,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\SAX2Print.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAX2Print.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -545,8 +545,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -567,23 +567,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SAX2Print.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				RuntimeLibrary="1"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\SAX2Print.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAX2Print_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -591,7 +589,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -599,14 +597,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\SAX2Print.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAX2Print.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -687,7 +685,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\SAX2Print.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/SAXCount/SAXCount.vcproj b/Projects/Win32/VC8/xerces-all/SAXCount/SAXCount.vcproj
index bcf6ee6fb..2dc7ea0a1 100644
--- a/Projects/Win32/VC8/xerces-all/SAXCount/SAXCount.vcproj
+++ b/Projects/Win32/VC8/xerces-all/SAXCount/SAXCount.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="SAXCount"
 	ProjectGUID="{2AB767A9-6A3B-4993-8FDB-3E6A30560739}"
 	>
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\SAXCount.exe"
 				LinkIncremental="1"
@@ -104,8 +104,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -126,22 +126,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SAXCount.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SAXCount.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAXCount_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -149,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -157,14 +158,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\SAXCount.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAXCount.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -192,7 +192,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -218,18 +218,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SAXCount.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAXCount_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -237,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -245,11 +245,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\SAXCount.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAXCount.pdb"
 				SubSystem="1"
 			/>
@@ -279,8 +280,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -301,21 +302,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SAXCount.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN64;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SAXCount.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAXCount_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -331,14 +334,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\SAXCount.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAXCount.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -366,8 +369,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -388,16 +391,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SAXCount.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\SAXCount.pch"
@@ -420,14 +422,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\SAXCount.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\SAXCount.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -455,7 +456,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -482,18 +483,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SAXCount.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAXCount_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -501,7 +502,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -509,12 +510,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\SAXCount.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAXCount.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -545,8 +545,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -567,23 +567,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SAXCount.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				RuntimeLibrary="1"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\SAXCount.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAXCount_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -591,7 +589,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -599,14 +597,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\SAXCount.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAXCount.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -687,7 +685,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\SAXCount.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/SAXPrint/SAXPrint.vcproj b/Projects/Win32/VC8/xerces-all/SAXPrint/SAXPrint.vcproj
index 96039bf9c..e0ef810fc 100644
--- a/Projects/Win32/VC8/xerces-all/SAXPrint/SAXPrint.vcproj
+++ b/Projects/Win32/VC8/xerces-all/SAXPrint/SAXPrint.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="SAXPrint"
 	ProjectGUID="{959445AC-9081-4590-B457-C96164CF4BFA}"
 	>
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\SAXPrint.exe"
 				LinkIncremental="1"
@@ -104,8 +104,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -126,22 +126,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SAXPrint.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SAXPrint.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAXPrint_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -149,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -157,14 +158,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\SAXPrint.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAXPrint.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -192,7 +192,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -218,18 +218,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SAXPrint.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAXPrint_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -237,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -245,11 +245,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\SAXPrint.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAXPrint.pdb"
 				SubSystem="1"
 			/>
@@ -279,8 +280,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -301,21 +302,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SAXPrint.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SAXPrint.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAXPrint_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -331,14 +334,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\SAXPrint.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAXPrint.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -366,8 +369,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -388,16 +391,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SAXPrint.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\SAXPrint.pch"
@@ -420,14 +422,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\SAXPrint.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\SAXPrint.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -455,7 +456,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -482,18 +483,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SAXPrint.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAXPrint_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -501,7 +502,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -509,12 +510,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\SAXPrint.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAXPrint.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -545,8 +545,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -567,23 +567,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SAXPrint.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				RuntimeLibrary="1"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\SAXPrint.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SAXPrint_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -591,7 +589,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -599,14 +597,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\SAXPrint.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SAXPrint.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -687,7 +685,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\SAXPrint.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/SCMPrint/SCMPrint.vcproj b/Projects/Win32/VC8/xerces-all/SCMPrint/SCMPrint.vcproj
index c64474775..45715dc5c 100644
--- a/Projects/Win32/VC8/xerces-all/SCMPrint/SCMPrint.vcproj
+++ b/Projects/Win32/VC8/xerces-all/SCMPrint/SCMPrint.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="SCMPrint"
 	ProjectGUID="{895EDBF3-6A97-4641-8D96-7282005F8DD7}"
 	>
@@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\SCMPrint.exe"
 				LinkIncremental="1"
@@ -103,8 +103,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -125,22 +125,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SCMPrint.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32;_WINDOWS"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\SCMPrint.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SCMPrint_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -148,7 +148,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -156,14 +156,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\SCMPrint.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SCMPrint.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -191,7 +190,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -217,17 +216,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32;_WINDOWS"
+				RuntimeLibrary="3"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SCMPrint.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SCMPrint_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -235,7 +235,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -243,11 +243,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\SCMPrint.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SCMPrint.pdb"
 				SubSystem="1"
 			/>
@@ -277,8 +278,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -299,21 +300,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SCMPrint.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN64;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SCMPrint.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SCMPrint_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -329,14 +332,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\SCMPrint.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SCMPrint.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -364,8 +367,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -386,16 +389,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SCMPrint.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\SCMPrint.pch"
 				AssemblerListingLocation="$(IntDir)\"
@@ -417,14 +419,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\SCMPrint.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\SCMPrint.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -452,7 +453,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -479,18 +480,17 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN64;_WINDOWS"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\SCMPrint.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SCMPrint_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -498,7 +498,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -506,12 +506,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\SCMPrint.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SCMPrint.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -542,8 +541,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -564,22 +563,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SCMPrint.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				RuntimeLibrary="1"
+				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\SCMPrint.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SCMPrint_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -587,7 +585,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -595,14 +593,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\SCMPrint.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SCMPrint.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -683,7 +681,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\SCMPrint.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/SEnumVal/SEnumVal.vcproj b/Projects/Win32/VC8/xerces-all/SEnumVal/SEnumVal.vcproj
index 62f223fbe..3db3aba87 100644
--- a/Projects/Win32/VC8/xerces-all/SEnumVal/SEnumVal.vcproj
+++ b/Projects/Win32/VC8/xerces-all/SEnumVal/SEnumVal.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="SEnumVal"
 	ProjectGUID="{2230D938-8908-4C12-9E96-9C6C4048A52D}"
 	>
@@ -71,7 +71,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\SEnumVal.exe"
 				LinkIncremental="1"
@@ -105,8 +105,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -127,22 +127,24 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SEnumVal.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SEnumVal.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SEnumVal_vc80"
+				BrowseInformation="0"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -150,7 +152,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -158,14 +160,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\SEnumVal.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SEnumVal.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -193,7 +194,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -219,19 +220,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SEnumVal.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SEnumVal_vc80"
-				BrowseInformation="0"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -239,7 +239,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -247,11 +247,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\SEnumVal.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SEnumVal.pdb"
 				SubSystem="1"
 			/>
@@ -281,8 +282,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -303,21 +304,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SEnumVal.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SEnumVal.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SEnumVal_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -333,14 +336,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\SEnumVal.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SEnumVal.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -368,8 +371,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -390,16 +393,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SEnumVal.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\SEnumVal.pch"
@@ -423,14 +425,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\SEnumVal.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\SEnumVal.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -458,7 +459,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -485,18 +486,19 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\SEnumVal.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SEnumVal_vc80"
+				BrowseInformation="0"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -504,7 +506,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -512,12 +514,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\SEnumVal.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SEnumVal.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -548,8 +549,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -570,24 +571,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\SEnumVal.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				RuntimeLibrary="1"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\SEnumVal.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\SEnumVal_vc80"
-				BrowseInformation="0"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -595,7 +593,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -603,14 +601,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\SEnumVal.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\SEnumVal.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -691,7 +689,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\SEnumVal.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/StdInParse/StdInParse.vcproj b/Projects/Win32/VC8/xerces-all/StdInParse/StdInParse.vcproj
index 4ced8d5f8..12e2dff0b 100644
--- a/Projects/Win32/VC8/xerces-all/StdInParse/StdInParse.vcproj
+++ b/Projects/Win32/VC8/xerces-all/StdInParse/StdInParse.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="StdInParse"
 	ProjectGUID="{D2D5D167-5DBC-4B68-9AF0-B7A9EBE86284}"
 	>
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\StdInParse.exe"
 				LinkIncremental="1"
@@ -104,8 +104,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -126,23 +126,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\StdInParse.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\StdInParse.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\StdInParse_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -150,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -158,14 +158,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\StdInParse.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\StdInParse.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -193,7 +192,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -219,18 +218,19 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\StdInParse.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\StdInParse_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -238,7 +238,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -246,11 +246,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\StdInParse.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\StdInParse.pdb"
 				SubSystem="1"
 			/>
@@ -280,8 +281,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -302,22 +303,24 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\StdInParse.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\StdInParse.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\StdInParse_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -333,14 +336,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\StdInParse.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\StdInParse.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -368,8 +371,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -390,16 +393,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\StdInParse.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\StdInParse.pch"
@@ -422,14 +424,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\StdInParse.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\StdInParse.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -457,7 +458,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -484,19 +485,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\StdInParse.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\StdInParse_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -504,7 +504,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -512,12 +512,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\StdInParse.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\StdInParse.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -548,8 +547,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -570,23 +569,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\StdInParse.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
 				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\StdInParse.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\StdInParse_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -594,7 +592,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -602,14 +600,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\StdInParse.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\StdInParse.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -691,7 +689,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\StdInParse.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/ThreadTest/ThreadTest.vcproj b/Projects/Win32/VC8/xerces-all/ThreadTest/ThreadTest.vcproj
index 35d660247..50409bdb4 100644
--- a/Projects/Win32/VC8/xerces-all/ThreadTest/ThreadTest.vcproj
+++ b/Projects/Win32/VC8/xerces-all/ThreadTest/ThreadTest.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="ThreadTest"
 	ProjectGUID="{792C0625-DE93-4756-AAFA-23CCED2157B0}"
 	>
@@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\ThreadTest.exe"
 				LinkIncremental="1"
@@ -103,8 +103,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -125,22 +125,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\ThreadTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\ThreadTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\ThreadTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -148,7 +148,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -156,14 +156,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\ThreadTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\ThreadTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -191,7 +190,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -217,17 +216,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\ThreadTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\ThreadTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -235,7 +235,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -243,11 +243,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\ThreadTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\ThreadTest.pdb"
 				SubSystem="1"
 			/>
@@ -277,8 +278,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -299,21 +300,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\ThreadTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN64;_WINDOWS"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\ThreadTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\ThreadTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -329,14 +332,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\ThreadTest.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\ThreadTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -364,8 +367,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -386,16 +389,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\ThreadTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\ThreadTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
@@ -417,14 +419,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\ThreadTest.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\ThreadTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -452,7 +453,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -479,18 +480,17 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\ThreadTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\ThreadTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -498,7 +498,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -506,12 +506,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\ThreadTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\ThreadTest.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -542,8 +541,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -564,22 +563,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\ThreadTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="$(IntDir)\ThreadTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\ThreadTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -587,7 +585,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -595,14 +593,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\ThreadTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\ThreadTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -683,7 +681,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\ThreadTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/XInclude/XInclude.vcproj b/Projects/Win32/VC8/xerces-all/XInclude/XInclude.vcproj
index 22f8abe5c..fbdbb6227 100644
--- a/Projects/Win32/VC8/xerces-all/XInclude/XInclude.vcproj
+++ b/Projects/Win32/VC8/xerces-all/XInclude/XInclude.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="XInclude"
 	ProjectGUID="{117D4C21-4C54-478F-83AE-D6179A8D7EF1}"
 	>
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\XInclude.exe"
 				LinkIncremental="1"
@@ -104,8 +104,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -126,22 +126,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\XInclude.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\XInclude.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\XInclude_vc80"
+				BrowseInformation="0"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -149,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -157,14 +158,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\XInclude.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\XInclude.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -192,7 +192,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -218,18 +218,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				RuntimeLibrary="3"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\XInclude.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\XInclude_vc80"
-				BrowseInformation="1"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -237,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -245,11 +245,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\XInclude.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\XInclude.pdb"
 				SubSystem="1"
 			/>
@@ -279,8 +280,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -301,21 +302,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\XInclude.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
+				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\XInclude.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\XInclude_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -331,14 +334,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\XInclude.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\XInclude.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -366,8 +369,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -388,22 +391,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\XInclude.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\XInclude.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\XInclude_vc80"
-				BrowseInformation="0"
+				BrowseInformation="1"
 				WarningLevel="3"
 				CompileAs="0"
 			/>
@@ -420,14 +422,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\XInclude.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\XInclude.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -455,7 +456,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -482,18 +483,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_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"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -501,7 +502,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -509,12 +510,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\XInclude.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\XInclude.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -545,8 +545,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -567,23 +567,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\XInclude.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				RuntimeLibrary="1"
+				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile="$(IntDir)\XInclude.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\XInclude_vc80"
-				BrowseInformation="1"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -591,7 +589,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -599,14 +597,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\XInclude.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\XInclude.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -687,7 +685,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\XInclude.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/XSTSHarness/XSTSHarness.vcproj b/Projects/Win32/VC8/xerces-all/XSTSHarness/XSTSHarness.vcproj
index d0822288b..ba8412d96 100644
--- a/Projects/Win32/VC8/xerces-all/XSTSHarness/XSTSHarness.vcproj
+++ b/Projects/Win32/VC8/xerces-all/XSTSHarness/XSTSHarness.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="XSTSHarness"
 	ProjectGUID="{D92806DD-C591-4782-BCF2-8A0D0338D67A}"
 	RootNamespace="XSTSHarness"
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -93,6 +96,85 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\..\..\src"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_3D.lib"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<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="Release|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
@@ -171,6 +253,85 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\..\..\src"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN32;_WINDOWS"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_3.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<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\$(ConfigurationName)"
@@ -198,7 +359,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -249,6 +410,85 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Static Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\..\..\src"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_static_3.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<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\$(ConfigurationName)"
@@ -278,7 +518,7 @@
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -327,6 +567,85 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Static Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\..\..\src"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_static_3D.lib"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<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>
diff --git a/Projects/Win32/VC8/xerces-all/XSValueTest/XSValueTest.vcproj b/Projects/Win32/VC8/xerces-all/XSValueTest/XSValueTest.vcproj
index 35d81aeba..a5e52fb15 100644
--- a/Projects/Win32/VC8/xerces-all/XSValueTest/XSValueTest.vcproj
+++ b/Projects/Win32/VC8/xerces-all/XSValueTest/XSValueTest.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="XSValueTest"
 	ProjectGUID="{D3552FBC-8618-43C5-86C0-237536D8E700}"
 	>
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\XSValueTest.exe"
 				LinkIncremental="2"
@@ -105,8 +105,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -127,21 +127,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\XSValueTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\XSValueTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\XSValueTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -149,7 +151,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -157,13 +159,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\XSValueTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\XSValueTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -191,7 +194,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
+			Name="Release|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -217,17 +220,17 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\XSValueTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\XSValueTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -235,7 +238,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -243,12 +246,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\XSValueTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\XSValueTest.pdb"
 				SubSystem="1"
 			/>
@@ -278,8 +280,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -300,15 +302,16 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\XSValueTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\XSValueTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
@@ -330,13 +333,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\XSValueTest.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\XSValueTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -364,8 +367,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -386,23 +389,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\XSValueTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="$(IntDir)\XSValueTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\XSValueTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -418,15 +419,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\XSValueTest.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\XSValueTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -454,7 +454,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
+			Name="Static Debug|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -481,17 +481,17 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64;_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="$(IntDir)\XSValueTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\XSValueTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -499,7 +499,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -507,11 +507,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\XSValueTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\XSValueTest.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -542,8 +543,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -564,22 +565,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\XSValueTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\XSValueTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\XSValueTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -595,15 +595,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\XSValueTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\XSValueTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -684,7 +682,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\XSValueTest.exe"
 				LinkIncremental="1"
diff --git a/Projects/Win32/VC8/xerces-all/XSerializerTest/XSerializerTest.vcproj b/Projects/Win32/VC8/xerces-all/XSerializerTest/XSerializerTest.vcproj
index f88851794..dbd2e6bd3 100644
--- a/Projects/Win32/VC8/xerces-all/XSerializerTest/XSerializerTest.vcproj
+++ b/Projects/Win32/VC8/xerces-all/XSerializerTest/XSerializerTest.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="XSerializerTest"
 	ProjectGUID="{4D8FEA60-A74F-4267-852F-C421AF12198D}"
 	>
@@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\XSerializerTest.exe"
 				LinkIncremental="1"
@@ -103,8 +103,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -125,22 +125,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\XSerializerTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\XSerializerTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\XSerializerTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -148,7 +148,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -156,14 +156,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalDependencies="xerces-c_3.lib"
 				OutputFile="$(OutDir)\XSerializerTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\XSerializerTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -191,7 +190,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -217,17 +216,18 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\XSerializerTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\XSerializerTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -235,7 +235,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -243,11 +243,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\XSerializerTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\XSerializerTest.pdb"
 				SubSystem="1"
 			/>
@@ -277,8 +278,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -299,21 +300,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\XSerializerTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN64;_WINDOWS"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="$(IntDir)\XSerializerTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\XSerializerTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -329,14 +332,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3D.lib"
+				AdditionalDependencies="xerces-c_3D.lib"
 				OutputFile="$(OutDir)\XSerializerTest.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\XSerializerTest.pdb"
 				SubSystem="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -364,8 +367,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -386,16 +389,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\XSerializerTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\XSerializerTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
@@ -417,14 +419,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\XSerializerTest.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ProgramDatabaseFile="$(OutDir)\XSerializerTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -452,7 +453,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
@@ -479,18 +480,17 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN64;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\XSerializerTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\XSerializerTest_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -498,7 +498,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -506,12 +506,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\XSerializerTest.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\XSerializerTest.pdb"
 				SubSystem="1"
 				TargetMachine="17"
@@ -542,8 +541,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -564,22 +563,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(OutDir)\XSerializerTest.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;WIN64;_WINDOWS;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;WIN32;_WINDOWS;XERCES_STATIC_LIBRARY"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="$(IntDir)\XSerializerTest.pch"
 				AssemblerListingLocation="$(IntDir)\"
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\XSerializerTest_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -587,7 +585,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -595,14 +593,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\XSerializerTest.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\XSerializerTest.pdb"
 				SubSystem="1"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -683,7 +681,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\XSerializerTest.exe"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj b/Projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj
index a8b489e14..a80dcb305 100644
--- a/Projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj
+++ b/Projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="XercesLib"
 	ProjectGUID="{152CE948-F659-4206-A50A-1D2B9658EF96}"
 	RootNamespace="XercesLib"
@@ -78,7 +78,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="ws2_32.lib advapi32.lib"
 				OutputFile="$(OutDir)\xerces-c_3_0.dll"
 				LinkIncremental="1"
@@ -178,7 +178,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="ws2_32.lib advapi32.lib"
 				OutputFile="$(OutDir)\xerces-c_3_0.dll"
 				LinkIncremental="1"
@@ -278,7 +277,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="ws2_32.lib advapi32.lib"
 				OutputFile="$(OutDir)\xerces-c_3_0D.dll"
 				LinkIncremental="2"
@@ -371,7 +370,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="ws2_32.lib advapi32.lib"
 				OutputFile="$(OutDir)\xerces-c_3_0D.dll"
 				LinkIncremental="2"
diff --git a/Projects/Win32/VC8/xerces-all/all/all.vcproj b/Projects/Win32/VC8/xerces-all/all/all.vcproj
index 12cc6ec97..c5168a549 100644
--- a/Projects/Win32/VC8/xerces-all/all/all.vcproj
+++ b/Projects/Win32/VC8/xerces-all/all/all.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="all"
 	ProjectGUID="{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}"
 	Keyword="MakeFileProj"
@@ -19,8 +19,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\Release"
-			IntermediateDirectory=".\..\..\..\..\..\Build\Win32\VC8\Release"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="10"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -39,9 +39,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\Debug"
-			IntermediateDirectory=".\..\..\..\..\..\Build\Win32\VC8\Debug"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="10"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -54,15 +54,16 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\StaticDebug"
-			IntermediateDirectory=".\..\..\..\..\..\Build\Win32\VC8\StaticDebug"
+			Name="Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="10"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -81,9 +82,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\StaticRelease"
-			IntermediateDirectory=".\..\..\..\..\..\Build\Win32\VC8\StaticRelease"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="10"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -96,15 +97,16 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="10"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -117,16 +119,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			Name="Static Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="10"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -146,9 +147,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="10"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -161,7 +162,6 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
@@ -169,8 +169,8 @@
 		</Configuration>
 		<Configuration
 			Name="Static Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="10"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
diff --git a/Projects/Win32/VC8/xerces-all/xerces-all.sln b/Projects/Win32/VC8/xerces-all/xerces-all.sln
index 59236ad74..dba0bf297 100644
--- a/Projects/Win32/VC8/xerces-all/xerces-all.sln
+++ b/Projects/Win32/VC8/xerces-all/xerces-all.sln
@@ -187,9 +187,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XSTSHarness", "XSTSHarness\
 	EndProjectSection
 EndProject
 Global
-	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
-		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
@@ -699,18 +696,25 @@ Global
 		{117D4C21-4C54-478F-83AE-D6179A8D7EF1}.Static Release|x64.Build.0 = Static Release|x64
 		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Debug|Win32.Build.0 = Debug|Win32
-		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Debug|x64.ActiveCfg = Debug|Win32
+		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Debug|x64.ActiveCfg = Debug|x64
+		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Debug|x64.Build.0 = Debug|x64
 		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Release|Win32.ActiveCfg = Release|Win32
 		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Release|Win32.Build.0 = Release|Win32
-		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Release|x64.ActiveCfg = Release|Win32
+		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Release|x64.ActiveCfg = Release|x64
+		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Release|x64.Build.0 = Release|x64
 		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Static Debug|Win32.ActiveCfg = Static Debug|Win32
 		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Static Debug|Win32.Build.0 = Static Debug|Win32
-		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Static Debug|x64.ActiveCfg = Debug|Win32
+		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Static Debug|x64.ActiveCfg = Static Debug|x64
+		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Static Debug|x64.Build.0 = Static Debug|x64
 		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Static Release|Win32.ActiveCfg = Static Release|Win32
 		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Static Release|Win32.Build.0 = Static Release|Win32
-		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Static Release|x64.ActiveCfg = Release|Win32
+		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Static Release|x64.ActiveCfg = Static Release|x64
+		{D92806DD-C591-4782-BCF2-8A0D0338D67A}.Static Release|x64.Build.0 = Static Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
+	EndGlobalSection
 EndGlobal
diff --git a/Projects/Win32/VC8/xerces-all/xerces-com/xerces-com.vcproj b/Projects/Win32/VC8/xerces-all/xerces-com/xerces-com.vcproj
index 2dd49b17b..53be1f6fc 100644
--- a/Projects/Win32/VC8/xerces-all/xerces-com/xerces-com.vcproj
+++ b/Projects/Win32/VC8/xerces-all/xerces-com/xerces-com.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="xml4com"
 	ProjectGUID="{9488FCC8-E44D-468C-B805-85001457ECFB}"
 	Keyword="AtlProj"
@@ -78,7 +78,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="wininet.lib shlwapi.lib xerces-c_3.lib"
 				OutputFile="$(OutDir)\xerces-com.dll"
 				LinkIncremental="1"
@@ -114,12 +114,13 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
+			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
 			>
@@ -140,16 +141,18 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="1"
+				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\..\..\..\src,..\..\..\..\..\src\xercesc\com"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_ATL_DEBUG_INTERFACES;_ATL_DEBUG_QI;_ATL_DEBUG_REFCOUNT;WIN32;_WINDOWS;_USRDLL"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;WIN64;_WINDOWS;_USRDLL"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile="$(IntDir)\xerces-com.pch"
@@ -157,7 +160,6 @@
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\xml4com_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -165,7 +167,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -173,16 +175,15 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wininet.lib shlwapi.lib xerces-c_3D.lib"
+				AdditionalDependencies="wininet.lib shlwapi.lib xerces-c_3.lib"
 				OutputFile="$(OutDir)\xerces-com.dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ModuleDefinitionFile="..\..\..\..\..\src\xercesc\com\xml4com.def"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\xerces-com.pdb"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)\xerces-com.lib"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -210,13 +211,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|Win32"
+			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
 			>
@@ -241,13 +241,12 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="1"
-				InlineFunctionExpansion="1"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src,..\..\..\..\..\src\xercesc\com"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;WIN32;_WINDOWS;_USRDLL;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_ATL_DEBUG_INTERFACES;_ATL_DEBUG_QI;_ATL_DEBUG_REFCOUNT;WIN32;_WINDOWS;_USRDLL"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				TreatWChar_tAsBuiltInType="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile="$(IntDir)\xerces-com.pch"
@@ -255,6 +254,7 @@
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\xml4com_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -262,7 +262,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -270,12 +270,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wininet.lib shlwapi.lib xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="wininet.lib shlwapi.lib xerces-c_3D.lib"
 				OutputFile="$(OutDir)\xerces-com.dll"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ModuleDefinitionFile="..\..\..\..\..\src\xercesc\com\xml4com.def"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\xerces-com.pdb"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)\xerces-com.lib"
@@ -306,8 +307,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Debug|Win32"
-			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -332,15 +333,17 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src,..\..\..\..\..\src\xercesc\com"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_ATL_DEBUG_INTERFACES;_ATL_DEBUG_QI;_ATL_DEBUG_REFCOUNT;WIN32;_WINDOWS;_USRDLL;XERCES_STATIC_LIBRARY"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_ATL_DEBUG_INTERFACES;_ATL_DEBUG_QI;_ATL_DEBUG_REFCOUNT;WIN64;_WINDOWS;_USRDLL"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
+				TreatWChar_tAsBuiltInType="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile="$(IntDir)\xerces-com.pch"
@@ -348,7 +351,7 @@
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\xml4com_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -364,8 +367,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wininet.lib shlwapi.lib xerces-c_static_3D.lib"
+				AdditionalDependencies="wininet.lib shlwapi.lib xerces-c_3D.lib"
 				OutputFile="$(OutDir)\xerces-com.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
@@ -374,6 +376,7 @@
 				ProgramDatabaseFile="$(OutDir)\xerces-com.pdb"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)\xerces-com.lib"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -401,8 +404,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -428,7 +431,6 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName=""
 			/>
 			<Tool
@@ -436,7 +438,7 @@
 				Optimization="1"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\..\..\..\src,..\..\..\..\..\src\xercesc\com"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;WIN64;_WINDOWS;_USRDLL"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;WIN32;_WINDOWS;_USRDLL;XERCES_STATIC_LIBRARY"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -462,8 +464,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wininet.lib shlwapi.lib xerces-c_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="wininet.lib shlwapi.lib xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\xerces-com.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
@@ -471,7 +473,6 @@
 				ProgramDatabaseFile="$(OutDir)\xerces-com.pdb"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)\xerces-com.lib"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -499,12 +500,13 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Static Release|x64"
 			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
+			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
 			>
@@ -530,12 +532,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="1"
+				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\..\..\..\src,..\..\..\..\..\src\xercesc\com"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_ATL_DEBUG_INTERFACES;_ATL_DEBUG_QI;_ATL_DEBUG_REFCOUNT;WIN64;_WINDOWS;_USRDLL"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				TreatWChar_tAsBuiltInType="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;WIN64;_WINDOWS;_USRDLL;XERCES_STATIC_LIBRARY"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile="$(IntDir)\xerces-com.pch"
@@ -543,7 +546,6 @@
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\xml4com_vc80"
 				WarningLevel="3"
-				DebugInformationFormat="3"
 				CompileAs="0"
 			/>
 			<Tool
@@ -551,7 +553,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -559,13 +561,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wininet.lib shlwapi.lib xerces-c_3D.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="wininet.lib shlwapi.lib xerces-c_static_3.lib"
 				OutputFile="$(OutDir)\xerces-com.dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ModuleDefinitionFile="..\..\..\..\..\src\xercesc\com\xml4com.def"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\xerces-com.pdb"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)\xerces-com.lib"
@@ -597,13 +598,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Static Release|x64"
-			OutputDirectory=".\..\..\..\..\..\Build\Win64\VC8\$(ConfigurationName)"
+			Name="Static Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC8\$(ConfigurationName)"
 			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
 			>
@@ -624,18 +624,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="1"
-				InlineFunctionExpansion="1"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\..\src,..\..\..\..\..\src\xercesc\com"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;WIN64;_WINDOWS;_USRDLL;XERCES_STATIC_LIBRARY"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_ATL_DEBUG_INTERFACES;_ATL_DEBUG_QI;_ATL_DEBUG_REFCOUNT;WIN32;_WINDOWS;_USRDLL;XERCES_STATIC_LIBRARY"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile="$(IntDir)\xerces-com.pch"
@@ -643,6 +640,7 @@
 				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\xml4com_vc80"
 				WarningLevel="3"
+				DebugInformationFormat="4"
 				CompileAs="0"
 			/>
 			<Tool
@@ -650,7 +648,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -658,16 +656,16 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wininet.lib shlwapi.lib xerces-c_static_3.lib"
+				AdditionalOptions=""
+				AdditionalDependencies="wininet.lib shlwapi.lib xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\xerces-com.dll"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ModuleDefinitionFile="..\..\..\..\..\src\xercesc\com\xml4com.def"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\xerces-com.pdb"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)\xerces-com.lib"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -754,7 +752,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="wininet.lib shlwapi.lib xerces-c_static_3D.lib"
 				OutputFile="$(OutDir)\xerces-com.dll"
 				LinkIncremental="2"
@@ -940,7 +938,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -948,7 +946,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Static Release|Win32"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -956,7 +954,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Static Debug|Win32"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -964,7 +962,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|x64"
+						Name="Static Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -972,7 +970,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Static Release|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -980,7 +978,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Static Release|x64"
+						Name="Static Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1019,7 +1017,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCMIDLTool"
@@ -1030,7 +1028,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Static Release|Win32"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCMIDLTool"
@@ -1041,7 +1039,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Static Debug|Win32"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCMIDLTool"
@@ -1052,7 +1050,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|x64"
+						Name="Static Release|Win32"
 						>
 						<Tool
 							Name="VCMIDLTool"
@@ -1063,7 +1061,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Static Release|x64"
 						>
 						<Tool
 							Name="VCMIDLTool"
@@ -1074,7 +1072,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Static Release|x64"
+						Name="Static Debug|Win32"
 						>
 						<Tool
 							Name="VCMIDLTool"
@@ -1108,7 +1106,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCResourceCompilerTool"
@@ -1116,7 +1114,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|x64"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCResourceCompilerTool"
diff --git a/samples/Projects/Win32/VC7.1/CreateDOMDocument/CreateDOMDocument.vcproj b/samples/Projects/Win32/VC7.1/CreateDOMDocument/CreateDOMDocument.vcproj
index 43aaa7585..0dc4688e6 100644
--- a/samples/Projects/Win32/VC7.1/CreateDOMDocument/CreateDOMDocument.vcproj
+++ b/samples/Projects/Win32/VC7.1/CreateDOMDocument/CreateDOMDocument.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_2D.lib"
 				OutputFile=".\..\..\..\..\..\bin/CreateDOMDocument.exe"
 				Version="1.0"
diff --git a/samples/Projects/Win32/VC7.1/DOMCount/DOMCount.vcproj b/samples/Projects/Win32/VC7.1/DOMCount/DOMCount.vcproj
index f211d3cc5..3728a04db 100644
--- a/samples/Projects/Win32/VC7.1/DOMCount/DOMCount.vcproj
+++ b/samples/Projects/Win32/VC7.1/DOMCount/DOMCount.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_2D.lib"
 				OutputFile=".\..\..\..\..\..\bin/DOMCount.exe"
 				Version="1.0"
diff --git a/samples/Projects/Win32/VC7.1/DOMPrint/DOMPrint.vcproj b/samples/Projects/Win32/VC7.1/DOMPrint/DOMPrint.vcproj
index cf1c273ef..4112c8b0b 100644
--- a/samples/Projects/Win32/VC7.1/DOMPrint/DOMPrint.vcproj
+++ b/samples/Projects/Win32/VC7.1/DOMPrint/DOMPrint.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_2D.lib"
 				OutputFile=".\..\..\..\..\..\bin/DOMPrint.exe"
 				Version="1.0"
diff --git a/samples/Projects/Win32/VC7.1/EnumVal/EnumVal.vcproj b/samples/Projects/Win32/VC7.1/EnumVal/EnumVal.vcproj
index 450b90b37..a1d57e7a9 100644
--- a/samples/Projects/Win32/VC7.1/EnumVal/EnumVal.vcproj
+++ b/samples/Projects/Win32/VC7.1/EnumVal/EnumVal.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_2D.lib"
 				OutputFile=".\..\..\..\..\..\bin/EnumVal.exe"
 				Version="1.0"
diff --git a/samples/Projects/Win32/VC7.1/MemParse/MemParse.vcproj b/samples/Projects/Win32/VC7.1/MemParse/MemParse.vcproj
index 28ed820c9..31906b865 100644
--- a/samples/Projects/Win32/VC7.1/MemParse/MemParse.vcproj
+++ b/samples/Projects/Win32/VC7.1/MemParse/MemParse.vcproj
@@ -38,7 +38,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_2D.lib"
 				OutputFile=".\..\..\..\..\..\bin/MemParse.exe"
 				Version="1.0"
diff --git a/samples/Projects/Win32/VC7.1/PParse/PParse.vcproj b/samples/Projects/Win32/VC7.1/PParse/PParse.vcproj
index 90da4f868..f024e299f 100644
--- a/samples/Projects/Win32/VC7.1/PParse/PParse.vcproj
+++ b/samples/Projects/Win32/VC7.1/PParse/PParse.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_2D.lib"
 				OutputFile=".\..\..\..\..\..\bin/PParse.exe"
 				Version="1.0"
diff --git a/samples/Projects/Win32/VC7.1/PSVIWriter/PSVIWriter.vcproj b/samples/Projects/Win32/VC7.1/PSVIWriter/PSVIWriter.vcproj
index 719d65593..a640bb807 100644
--- a/samples/Projects/Win32/VC7.1/PSVIWriter/PSVIWriter.vcproj
+++ b/samples/Projects/Win32/VC7.1/PSVIWriter/PSVIWriter.vcproj
@@ -40,7 +40,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_2D.lib"
 				OutputFile=".\..\..\..\..\..\bin/PSVIWriter.exe"
 				Version="1.0"
diff --git a/samples/Projects/Win32/VC7.1/Redirect/Redirect.vcproj b/samples/Projects/Win32/VC7.1/Redirect/Redirect.vcproj
index de37e8a77..2dc07a74e 100644
--- a/samples/Projects/Win32/VC7.1/Redirect/Redirect.vcproj
+++ b/samples/Projects/Win32/VC7.1/Redirect/Redirect.vcproj
@@ -38,7 +38,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_2D.lib"
 				OutputFile=".\..\..\..\..\..\bin/Redirect.exe"
 				Version="1.0"
diff --git a/samples/Projects/Win32/VC7.1/SAX2Count/SAX2Count.vcproj b/samples/Projects/Win32/VC7.1/SAX2Count/SAX2Count.vcproj
index c34132dfe..fe0b0b00e 100644
--- a/samples/Projects/Win32/VC7.1/SAX2Count/SAX2Count.vcproj
+++ b/samples/Projects/Win32/VC7.1/SAX2Count/SAX2Count.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_2D.lib"
 				OutputFile=".\..\..\..\..\..\bin/SAX2Count.exe"
 				Version="1.0"
diff --git a/samples/Projects/Win32/VC7.1/SAX2Print/SAX2Print.vcproj b/samples/Projects/Win32/VC7.1/SAX2Print/SAX2Print.vcproj
index 17cdead16..0f9f77950 100644
--- a/samples/Projects/Win32/VC7.1/SAX2Print/SAX2Print.vcproj
+++ b/samples/Projects/Win32/VC7.1/SAX2Print/SAX2Print.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_2D.lib"
 				OutputFile=".\..\..\..\..\..\bin/SAX2Print.exe"
 				Version="1.0"
diff --git a/samples/Projects/Win32/VC7.1/SAXCount/SAXCount.vcproj b/samples/Projects/Win32/VC7.1/SAXCount/SAXCount.vcproj
index 394b67798..b9341918d 100644
--- a/samples/Projects/Win32/VC7.1/SAXCount/SAXCount.vcproj
+++ b/samples/Projects/Win32/VC7.1/SAXCount/SAXCount.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_2D.lib"
 				OutputFile=".\..\..\..\..\..\bin/SAXCount.exe"
 				Version="1.0"
diff --git a/samples/Projects/Win32/VC7.1/SAXPrint/SAXPrint.vcproj b/samples/Projects/Win32/VC7.1/SAXPrint/SAXPrint.vcproj
index e4e5b44f2..9cd4a3fde 100644
--- a/samples/Projects/Win32/VC7.1/SAXPrint/SAXPrint.vcproj
+++ b/samples/Projects/Win32/VC7.1/SAXPrint/SAXPrint.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_2D.lib"
 				OutputFile=".\..\..\..\..\..\bin/SAXPrint.exe"
 				Version="1.0"
diff --git a/samples/Projects/Win32/VC7.1/SCMPrint/scmprint.vcproj b/samples/Projects/Win32/VC7.1/SCMPrint/scmprint.vcproj
index 7c8658f83..d595bc6bc 100644
--- a/samples/Projects/Win32/VC7.1/SCMPrint/scmprint.vcproj
+++ b/samples/Projects/Win32/VC7.1/SCMPrint/scmprint.vcproj
@@ -40,7 +40,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_2D.lib"
 				OutputFile=".\..\..\..\..\..\bin/scmprint.exe"
 				Version="1.0"
diff --git a/samples/Projects/Win32/VC7.1/SEnumVal/SEnumVal.vcproj b/samples/Projects/Win32/VC7.1/SEnumVal/SEnumVal.vcproj
index 67b7914e7..94281f908 100644
--- a/samples/Projects/Win32/VC7.1/SEnumVal/SEnumVal.vcproj
+++ b/samples/Projects/Win32/VC7.1/SEnumVal/SEnumVal.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_2D.lib"
 				OutputFile=".\..\..\..\..\..\bin/SEnumVal.exe"
 				Version="1.0"
diff --git a/samples/Projects/Win32/VC7.1/StdInParse/StdInParse.vcproj b/samples/Projects/Win32/VC7.1/StdInParse/StdInParse.vcproj
index c56ee7d84..23d61ef59 100644
--- a/samples/Projects/Win32/VC7.1/StdInParse/StdInParse.vcproj
+++ b/samples/Projects/Win32/VC7.1/StdInParse/StdInParse.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions=""
 				AdditionalDependencies="xerces-c_2D.lib"
 				OutputFile=".\..\..\..\..\..\bin/StdInParse.exe"
 				Version="1.0"
-- 
GitLab