diff --git a/Projects/Win32/VC7.1/xerces-all/CreateDOMDocument/CreateDOMDocument.vcproj b/Projects/Win32/VC7.1/xerces-all/CreateDOMDocument/CreateDOMDocument.vcproj
index 87a3151a386ef78f84d505e0937a5fc44259e1a0..6539d2f2dce93e77512f1ad657545155f95534c4 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 79d04edc50b70681c6b8790499502a81e6b967d6..5f510a760b2b47270f0788c1b6a3dfeb714877ac 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 9521427ff0dd18ef62c26c0ed0ac7964fe16ed0a..f557cd834feed0357e3c927369f05e7f7fb75efa 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 e1f2c7588e050d66401ce068d674d662d15e9a27..210705105cc812df0364d6dc216e36f261e4a618 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 6a1d23b7e730e9ed71419bcb2b7a7d2e0587225d..f89dd6b2fb400092a01761c8025e56fbba33be61 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 43d3b11ec939949b9351d530169fd5d4deb4d305..33f95612999bb02ddc92fbe2aca7e81534783411 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 67aef8e9dc6e60261af57819bda804929eabf437..98905091f10e35e03c7bd6eed2d208570cb676ae 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 a982de9e2e356bfcafc1e7aec174b9b16e581af8..fb152f9c328038787f8d43754c33933426f4a1bd 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 24633c58d5556b4e732a631224ef6c44f6944f34..a22c1bc5eb86804fb0ba1066e860d7aa6a6e4311 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 db2c30433e04cdfef35f5d30152274bb7f5c9164..aeb655574ef3bd0b9a59d13be4a92d2c3155c5ad 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 3b07161ca8b99083a228d23cbeb1b83c57da72f5..864322f517b6512ed8d0afde52f6c719275546a3 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 e3a9ea9a4a6eff54b78051e3b823161835bd7547..c8202f4037a50c6c5f79afa8e3acdd8fb22ce1dc 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 10b65d7fd0057c57bf30f60bc20300c4d55e4dc5..4824a2319a76ae485dc1e48b5433b942cf7bd5e3 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 a2282f4d01fa22c71524d30af80660f790d529bf..54d413f23673455680289d6be6cf7a2f507efcc1 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 dc88163a394606e2c652e5fd556836f399c007ad..1a2e9fe67f14f097862e8e306706ca17618fc673 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 ae6bc489408092ff556df14ee2d86969b1b24956..5f3e38b34714b8c34a74f2595063ab86d2d4a06a 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 359db68aa5e6d95ff320fa9183b48a061f0eea07..8d345503e03bde61fe3098ac4026b02bfc2dc463 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 8ed49a2505d55638cf525f6cf171a90e1940536b..e2c4b72a5e32a639d1ecabc63afa4efcaf780898 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 d2211a33ac10e0f056df57c2f14b4c6a39235000..2795dda3a034ea75eb59f5302d1f0d0cf75ec6c6 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 aa4936c629ed3b4d8e763be1dd5e09d90620c609..c8892f957ec3b2f0e9f4c47a743fbc510d28d4c3 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 a2972c5098c0c220fcc33551be1028df6ca670f0..ceabf1c3d9f7d0dba4dd395e6bd414ccaaf1fd90 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 f4a4a5f89db977b294c461e8c94b2db93ffeaf8b..103d0d2b297d63c61bed2cb5227d7363836c070d 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 847883dea12e4fd12bb3cc7d029dc3b7776b5d0e..533127fbef2702f2cacf441a045d53af3061fae7 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 83b0b38405c50433cac0af4417663fbc243f4863..3698082e19ff27da533e7dc81ed99e90e71859f8 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 dbc16ec1c1d8d62d797392d70d7dd51509a924f2..109c9361ceda65c89523e391d3b7715a0f42fbbd 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 2a988bf37f771b4f7babfd3eabd2a27209e28c7d..fc3dba2aabea86ce915a919aa8055721f7a4df01 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 02760c368193df2755f8725d7c772d16441a4187..cff4e4b82fcfc0e71c1924e2d64b475f3161987c 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 3d52bafb10394cc0cd0a647c2f79dcd7bdd66d3d..7331481392ad397b9cd474039575e9b43d09fc41 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 8253d941cee6c1e3a677effe40254dfc8edc6e25..4d61d33192107d29b6a5405a9a930a184105ea36 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 dfa125bd5836a389101ac0dfe99044edfbdd96b7..243cf3df493b0aaa97019c91e1695b5c0e4f83fe 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 e6ef80325ae0e3bdcfa8712a79a42ed3f5ef8bc0..989e5044b0a8ec9d5573006ea02f66dd6bde3756 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 fada2f4db36c7359478eec530b72a466339a2222..790242f7f5d17eab177f5f0c6bbc3dc20dc5d2b9 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 9790b652e82d360462d51c9fe296a892da8f2441..1b44e9e7859316fb3258550d1f8f1a69a59cc65f 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 1b6596680c41f6b32dc2dd8d658c724701b17e24..6c22b7181b86df83798913324c48cd9ad0b1f820 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 6b270e470fa339df1f463789563e45980ea6fd87..84206b7bb9d8bd5a0b0bfa30a22a615ba816914e 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 a32af93649eaf2c6f67f871e58c41e97ccaaeb6e..e68b42118a13e68d00b4736a5ca4174b10b2bd37 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 6991537ff302531ba3172b75cca8ae5b6777bc9e..b8e7b90026d5950047c4d7bb4effafc9d3c6d875 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 40b561f69ea88e269d3148a8ea99f39b2d39ce76..589f193a37d14baf2d523d57ccbc7958b6dc8cf5 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 7c64683920ffa0dda75c37998f286d17b9467fa6..bb78c0a71e206e85b076a117442bff2493cb55c3 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 a5b3f71758b8e6f6e49fe4a0ea4ff76421e1592e..4b8a8885ae9f3e3acb49bf1b709cc87a69732206 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 6b3413bf163213c971a25f599b1421f1a4bb42d4..bc1b4b1083d18a423b3bb446d20ea82c4529fc59 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 9b9485efeed7663484427b74d2a7c3674716bdac..29696003f44214eaddcfbebf3f4fc9eac56a0edb 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 bc1bc85471f55183ad5d37ce68c07d85e1214ad1..d6b28d2a7736f32756dcb90b4319cd27c95d5e0a 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 54ff31c4fd43458f6568780df7026e33c579b5d4..a08558b28282f91d55c103474d7d0274b5798c67 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 e0de9364939d07c2bd6fc604e732da5f07f320f2..82edd1064d49a3fd65338845048724b98bcccdc1 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 6f835c2d11b417f89bf9f019fc52ba75cd4d80a9..f381c9b3e67b09f7dd5a77ac3d4ea9a07ac39d5a 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 479617f0bfe3fae5af9b40d5f31598439ef31807..911757d521a32afa8194070aed02bf94a79ee17b 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 8f7f49d1aabc718cce6030e1e163c1c761956012..ded114da20ea9b1c6f6dcb6e86a727e5e6f3625a 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 8a121d99244b7312dd2391575ae415a475f1df97..442980fdee5e8b9d0145f2ddba50c121e9d601ec 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 bcf6ee6fbb2f67d7296ebd57c4e1925e03dff748..2dc7ea0a1eb2c7fa8bd07bf09dc68460994f6bcd 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 96039bf9c5f66a6d0e23c4d5425fff3bb7a82a36..e0ef810fc4c84ba22e528e043a83fd586a0371b2 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 c64474775af64aacc4978d0b70d1ee74e5b49c35..45715dc5c773afa82f42db6f006f25a689bc81d6 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 62f223fbec7b78a1c06bb49758a4e226a1834428..3db3aba87b26227d12229c45a0c6755759c31415 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 4ced8d5f83a794f2689135ce2d7232fcf56829fa..12e2dff0b72f596f4df342b9981fa42eea91d384 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 35d660247252525bc1cda6f66f32bb2ac86d84d7..50409bdb470d8bd3e93950a76d3a68154940af50 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 22f8abe5c0e7b9e83fd9d65fe953e983c5f40c50..fbdbb6227b068636e6bce54c487742674888e980 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 d0822288b75f354b5ee7a9156da7efc5f760c35d..ba8412d967c0e13433f56aec8064db65a99e3b07 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 35d81aeba7f1624ab0b33f1d3f67bce958a47d21..a5e52fb15b1b4e28a41a3e0ba9863aa76efdaae4 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 f88851794e0f9ecb3885b8b5b61a8b5e537648f1..dbd2e6bd3f32a8e9dcbcefd2ed88d0e5af49ac64 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 a8b489e14f687e252645a6eb715a99a430549f52..a80dcb3059fe21fb9a1c48cb98262398119c72ba 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 12cc6ec9753e440e8a213cf982d87b450a1c7e98..c5168a5490489192a80eb1e43d992d69fb55ace8 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 59236ad74fe8076ca7776c5c6fd1cc887d25f7de..dba0bf297726489abc8942d1cfff006b6ac80f8d 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 2dd49b17bc1d3dc7b917b0cb0cdb546f11f86b3b..53be1f6fc5de3aa6f5721d2ae50b7c649e847225 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 43aaa758505e51ce8c6b3710d594013ec903e6cd..0dc4688e67b16a53d8434761b6c9aa4e2cdc2700 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 f211d3cc50717faa4bddc993c99f683958dd5e06..3728a04db8e3383645eb7bff994186773c10d827 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 cf1c273ef64b580b70234efa1f1124d0edd913c2..4112c8b0b06131841bfdabd74c98e020ef153e22 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 450b90b37dea5031aa7bcbd2f53801d03c328c32..a1d57e7a9ec4425ef2bbf3230b4c6888e377d708 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 28ed820c922fa3947a16c267641ba50809e86545..31906b865943c7182de639d486cbe1731e87f10e 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 90da4f86891c8651e93eb915749d1d89463ba90d..f024e299f2f6ad1d0c934df3bb7de6b887499757 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 719d655930c3da86850d9ca469d899e04e2937ce..a640bb807c68d08e43f52970a0ecadd54bf79604 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 de37e8a779a3d22af7edb7441bc44885ebd50e2d..2dc07a74e3e9cdefe3ac35dbd2848f1cfb9eb7ff 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 c34132dfe84bc643c3e8c5d7544675c5979de207..fe0b0b00e6578b7b283d81146cf75856e70681f2 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 17cdead16bf3ac5641eb7d2a0484a0da4f0d59f6..0f9f779505f16da4fd90e74669ec9ee944ca3261 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 394b677983d660ed83825b8ab20a8bc6f3654595..b9341918d9a8411a09ebaa7cdda16b97cec9b23b 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 e4e5b44f299010ede48e6fd149398e92b84cc06a..9cd4a3fded641b28f648882e0ce3a059acd31908 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 7c8658f8395f637d20296489da0a2a749c79c706..d595bc6bc04e058f6357fa9eea0c75d143d5756d 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 67b7914e7a03356a8f5c3ca2f6585ec3025a84c5..94281f90835daa59ca7b281f0274ec48876f1080 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 c56ee7d84459797d924d754e80da08264eaa5552..23d61ef59e1aaf02acbf981c1c99a453994163d4 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"