diff --git a/vs10/Arabica_tests.sln b/vs10/Arabica_tests.sln
index 4db494d3..dadef1e8 100644
--- a/vs10/Arabica_tests.sln
+++ b/vs10/Arabica_tests.sln
@@ -10,6 +10,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_silly", "test_DOM_
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_wide", "test_DOM_wide.vcxproj", "{DE6FD811-12BD-4914-BA29-CD987C4B0D48}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter", "test_SAX_filter.vcxproj", "{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_silly", "test_SAX_filter_silly.vcxproj", "{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_wide", "test_SAX_filter_wide.vcxproj", "{FB5B88E9-DAB3-401C-B413-77403C562C49}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_utils", "test_utils.vcxproj", "{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xpath", "test_xpath.vcxproj", "{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xpath_silly", "test_xpath_silly.vcxproj", "{92BC362C-4B23-4444-A9A8-81933D01D283}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xpath_wide", "test_xpath_wide.vcxproj", "{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xslt", "test_xslt.vcxproj", "{44BA3424-C58E-4A49-ADDD-6180C61E5E34}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -36,6 +52,38 @@ Global
 		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|Win32.Build.0 = Debug|Win32
 		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release|Win32.ActiveCfg = Release|Win32
 		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release|Win32.Build.0 = Release|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug|Win32.Build.0 = Debug|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|Win32.ActiveCfg = Release|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|Win32.Build.0 = Release|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Debug|Win32.Build.0 = Debug|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|Win32.ActiveCfg = Release|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|Win32.Build.0 = Release|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Debug|Win32.Build.0 = Debug|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|Win32.ActiveCfg = Release|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|Win32.Build.0 = Release|Win32
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Debug|Win32.Build.0 = Debug|Win32
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|Win32.ActiveCfg = Release|Win32
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|Win32.Build.0 = Release|Win32
+		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Debug|Win32.Build.0 = Debug|Win32
+		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Release|Win32.ActiveCfg = Release|Win32
+		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Release|Win32.Build.0 = Release|Win32
+		{92BC362C-4B23-4444-A9A8-81933D01D283}.Debug|Win32.ActiveCfg = Debug|Win32
+		{92BC362C-4B23-4444-A9A8-81933D01D283}.Debug|Win32.Build.0 = Debug|Win32
+		{92BC362C-4B23-4444-A9A8-81933D01D283}.Release|Win32.ActiveCfg = Release|Win32
+		{92BC362C-4B23-4444-A9A8-81933D01D283}.Release|Win32.Build.0 = Release|Win32
+		{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}.Debug|Win32.Build.0 = Debug|Win32
+		{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}.Release|Win32.ActiveCfg = Release|Win32
+		{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}.Release|Win32.Build.0 = Release|Win32
+		{44BA3424-C58E-4A49-ADDD-6180C61E5E34}.Debug|Win32.ActiveCfg = Debug|Win32
+		{44BA3424-C58E-4A49-ADDD-6180C61E5E34}.Debug|Win32.Build.0 = Debug|Win32
+		{44BA3424-C58E-4A49-ADDD-6180C61E5E34}.Release|Win32.ActiveCfg = Release|Win32
+		{44BA3424-C58E-4A49-ADDD-6180C61E5E34}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/vs10/lib_arabica.vcxproj b/vs10/lib_arabica.vcxproj
index 6d2949ae..c011f6a8 100644
--- a/vs10/lib_arabica.vcxproj
+++ b/vs10/lib_arabica.vcxproj
@@ -373,7 +373,7 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\vs7\ArabicaConfig.S">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /TC /EP -D USE_EXPAT ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /TC /EP -D USE_MSXML ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\include\SAX\ArabicaConfig.hpp;%(Outputs)</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /TC /EP -D USE_MSXML ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp
diff --git a/vs10/test_SAX_filter.vcxproj b/vs10/test_SAX_filter.vcxproj
index dec13570..276953a5 100644
--- a/vs10/test_SAX_filter.vcxproj
+++ b/vs10/test_SAX_filter.vcxproj
@@ -45,6 +45,8 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_SAXFilter\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <TargetName>sax_filter_test</TargetName>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\work\usr\include;$(IncludePath)</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\work\usr\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/vs10/test_SAX_filter_silly.vcxproj b/vs10/test_SAX_filter_silly.vcxproj
index b465ac3b..77c3bd95 100644
--- a/vs10/test_SAX_filter_silly.vcxproj
+++ b/vs10/test_SAX_filter_silly.vcxproj
@@ -45,6 +45,8 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_SAXFilter_silly\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <TargetName>sax_filter_test_silly</TargetName>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\work\usr\include;$(IncludePath)</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\work\usr\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/vs10/test_SAX_filter_wide.vcxproj b/vs10/test_SAX_filter_wide.vcxproj
index 47c666ca..ae02a485 100644
--- a/vs10/test_SAX_filter_wide.vcxproj
+++ b/vs10/test_SAX_filter_wide.vcxproj
@@ -45,6 +45,8 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_SAXFilter_wide\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <TargetName>sax_filter_test_wide</TargetName>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\work\usr\include;$(IncludePath)</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\work\usr\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/vs10/test_utils.vcxproj b/vs10/test_utils.vcxproj
index 038465de..2b35bb84 100644
--- a/vs10/test_utils.vcxproj
+++ b/vs10/test_utils.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -44,6 +44,8 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_utils\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <TargetName>utils_test</TargetName>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\work\usr\include;$(IncludePath)</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\work\usr\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/vs10/test_xpath.vcxproj b/vs10/test_xpath.vcxproj
index 1b3f8d70..080e04d1 100644
--- a/vs10/test_xpath.vcxproj
+++ b/vs10/test_xpath.vcxproj
@@ -45,6 +45,8 @@
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">xpath_test</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">xpath_test</TargetName>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\work\usr\include;$(IncludePath)</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\work\usr\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/vs10/test_xpath_silly.vcxproj b/vs10/test_xpath_silly.vcxproj
index f500fae9..68764eb5 100644
--- a/vs10/test_xpath_silly.vcxproj
+++ b/vs10/test_xpath_silly.vcxproj
@@ -44,6 +44,8 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_xpath_silly\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <TargetName>xpath_test_silly</TargetName>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\work\usr\include;$(IncludePath)</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\work\usr\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/vs10/test_xpath_wide.vcxproj b/vs10/test_xpath_wide.vcxproj
index 3ef1ff38..6b56ad16 100644
--- a/vs10/test_xpath_wide.vcxproj
+++ b/vs10/test_xpath_wide.vcxproj
@@ -44,6 +44,8 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_xpath_wide\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <TargetName>xpath_test_wide</TargetName>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\work\usr\include;$(IncludePath)</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\work\usr\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/vs10/test_xslt.vcxproj b/vs10/test_xslt.vcxproj
index ec70bb13..4ff84bb8 100644
--- a/vs10/test_xslt.vcxproj
+++ b/vs10/test_xslt.vcxproj
@@ -45,6 +45,8 @@
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">xslt_test</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">xslt_test</TargetName>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\work\usr\include;$(IncludePath)</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\work\usr\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>