diff --git a/vs7/Arabica.sln b/vs7/Arabica.sln
index f6b979d5..ed5f9a50 100644
--- a/vs7/Arabica.sln
+++ b/vs7/Arabica.sln
@@ -145,6 +145,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_XSLT_Mangle", "exam
 		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAXFilter", "test_SAX_filter.vcproj", "{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAXFilter_silly", "test_SAX_filter_silly.vcproj", "{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAXFilter_wide", "test_SAX_filter_wide.vcproj", "{FB5B88E9-DAB3-401C-B413-77403C562C49}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -219,6 +231,18 @@ Global
 		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Debug.Build.0 = Debug|Win32
 		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Release.ActiveCfg = Release|Win32
 		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Release.Build.0 = Release|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug.ActiveCfg = Debug|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug.Build.0 = Debug|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release.ActiveCfg = Release|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release.Build.0 = Release|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Debug.ActiveCfg = Debug|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Debug.Build.0 = Debug|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release.ActiveCfg = Release|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release.Build.0 = Release|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Debug.ActiveCfg = Debug|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Debug.Build.0 = Debug|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release.ActiveCfg = Release|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/vs7/example_DOM_writer.vcproj b/vs7/example_DOM_writer.vcproj
index 696334d0..520cc638 100644
--- a/vs7/example_DOM_writer.vcproj
+++ b/vs7/example_DOM_writer.vcproj
@@ -36,6 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
 				OutputFile="$(OutDir)/DOMWriter.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
@@ -81,6 +82,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -90,7 +92,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib"
+				AdditionalDependencies="..\lib\arabica.lib"
 				OutputFile="$(OutDir)/DOMWriter.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -130,12 +132,6 @@
 				RelativePath="..\examples\Dom\DOMWriter.cpp">
 			</File>
 		</Filter>
-		<Filter
-			Name="Libs">
-			<File
-				RelativePath="..\lib\Arabica.lib">
-			</File>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/vs7/example_SAX_pyx.vcproj b/vs7/example_SAX_pyx.vcproj
index 6c846e3c..ea1e9b74 100644
--- a/vs7/example_SAX_pyx.vcproj
+++ b/vs7/example_SAX_pyx.vcproj
@@ -29,12 +29,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Debug_examples_SAX_pyx/pyx.pch"
-				AssemblerListingLocation=".\Debug_examples_SAX_pyx/"
-				ObjectFile=".\Debug_examples_SAX_pyx/"
-				ProgramDataBaseFileName=".\Debug_examples_SAX_pyx/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="4"
@@ -44,17 +42,16 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wsock32.lib"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
 				OutputFile="$(OutDir)/pyx.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\..\..\bin/pyx.pdb"
+				ProgramDatabaseFile="$(OutDir)/pyx.pdb"
 				SubSystem="1"/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\..\..\bin/pyx.tlb"/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -93,12 +90,10 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release_examples_SAX_pyx/pyx.pch"
-				AssemblerListingLocation=".\Release_examples_SAX_pyx/"
-				ObjectFile=".\Release_examples_SAX_pyx/"
-				ProgramDataBaseFileName=".\Release_examples_SAX_pyx/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				CompileAs="0"/>
@@ -107,15 +102,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wsock32.lib"
+				AdditionalDependencies="..\lib\arabica.lib"
 				OutputFile="$(OutDir)/pyx.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\..\bin/pyx.pdb"
 				SubSystem="1"/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\..\bin/pyx.tlb"/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -148,12 +141,6 @@
 				RelativePath="..\examples\Sax\pyx.cpp">
 			</File>
 		</Filter>
-		<Filter
-			Name="Libs">
-			<File
-				RelativePath="..\lib\Arabica.lib">
-			</File>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/vs7/example_SAX_simplehander.vcproj b/vs7/example_SAX_simplehander.vcproj
index 89bd0e14..788e6d5a 100644
--- a/vs7/example_SAX_simplehander.vcproj
+++ b/vs7/example_SAX_simplehander.vcproj
@@ -29,12 +29,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile=".\Debug/SimpleHandler.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
@@ -45,16 +43,15 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wsock32.lib"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
 				OutputFile="$(OutDir)/SimpleHandler.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\..\..\bin/SimpleHandler.pdb"
+				ProgramDatabaseFile="$(OutDir)/SimpleHandler.pdb"
 				SubSystem="1"/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\..\..\bin/SimpleHandler.tlb"/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -93,12 +90,10 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile=".\Release/SimpleHandler.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				CompileAs="0"/>
@@ -107,15 +102,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wsock32.lib"
+				AdditionalDependencies="..\lib\arabica.lib"
 				OutputFile="$(OutDir)/SimpleHandler.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\..\bin/SimpleHandler.pdb"
 				SubSystem="1"/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\..\bin/SimpleHandler.tlb"/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -158,12 +151,6 @@
 				RelativePath="..\examples\Sax\SimpleHandler.h">
 			</File>
 		</Filter>
-		<Filter
-			Name="Libs">
-			<File
-				RelativePath="..\lib\Arabica.lib">
-			</File>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/vs7/example_SAX_writer.vcproj b/vs7/example_SAX_writer.vcproj
index 7bfc799e..67ebdd8e 100644
--- a/vs7/example_SAX_writer.vcproj
+++ b/vs7/example_SAX_writer.vcproj
@@ -29,12 +29,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Debug/Writer.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="4"
@@ -44,16 +42,15 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
 				OutputFile="$(OutDir)/Writer.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\..\..\bin/Writer.pdb"
+				ProgramDatabaseFile="$(OutDir)/Writer.pdb"
 				SubSystem="1"/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\..\..\bin/Writer.tlb"/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -92,12 +89,10 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release/Writer.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@@ -105,15 +100,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wsock32.lib"
+				AdditionalDependencies="..\lib\arabica.lib"
 				OutputFile="$(OutDir)/Writer.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Release/Writer.pdb"
 				SubSystem="1"/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/Writer.tlb"/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -147,12 +140,6 @@
 				RelativePath="..\examples\Sax\writer.cpp">
 			</File>
 		</Filter>
-		<Filter
-			Name="Libs">
-			<File
-				RelativePath="..\lib\Arabica.lib">
-			</File>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/vs7/example_SAX_xmlbase.vcproj b/vs7/example_SAX_xmlbase.vcproj
index b957f6d2..7179f814 100644
--- a/vs7/example_SAX_xmlbase.vcproj
+++ b/vs7/example_SAX_xmlbase.vcproj
@@ -25,6 +25,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -34,10 +35,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
 				OutputFile="$(OutDir)/XMLBase.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/example_XMLBase.pdb"
+				ProgramDatabaseFile="$(OutDir)/XMLBase.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
@@ -73,6 +75,7 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -82,6 +85,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica.lib"
 				OutputFile="$(OutDir)/XMLBase.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -122,12 +126,6 @@
 				RelativePath="..\examples\Sax\xmlbase.cpp">
 			</File>
 		</Filter>
-		<Filter
-			Name="Libs">
-			<File
-				RelativePath="..\lib\Arabica.lib">
-			</File>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/vs7/example_Utils_transcode.vcproj b/vs7/example_Utils_transcode.vcproj
index d268f122..074056ea 100644
--- a/vs7/example_Utils_transcode.vcproj
+++ b/vs7/example_Utils_transcode.vcproj
@@ -25,6 +25,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -34,6 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
 				OutputFile="$(OutDir)/transcode.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -78,6 +80,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -87,6 +90,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica.lib"
 				OutputFile="$(OutDir)/transcode.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -126,12 +130,6 @@
 				RelativePath="..\examples\Utils\transcode.cpp">
 			</File>
 		</Filter>
-		<Filter
-			Name="Libs">
-			<File
-				RelativePath="..\lib\Arabica.lib">
-			</File>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/vs7/example_XPath_xgrep.vcproj b/vs7/example_XPath_xgrep.vcproj
index 30f3d08b..650d1899 100644
--- a/vs7/example_XPath_xgrep.vcproj
+++ b/vs7/example_XPath_xgrep.vcproj
@@ -35,10 +35,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
 				OutputFile="$(OutDir)/xgrep.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/XPath.pdb"
+				ProgramDatabaseFile="$(OutDir)/xgrep.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
@@ -74,6 +75,8 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
@@ -82,7 +85,8 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/XPath.exe"
+				AdditionalDependencies="..\lib\arabica.lib"
+				OutputFile="$(OutDir)/xgrep.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
@@ -122,12 +126,6 @@
 				RelativePath="..\examples\XPath\xgrep.cpp">
 			</File>
 		</Filter>
-		<Filter
-			Name="Libs">
-			<File
-				RelativePath="..\lib\Arabica.lib">
-			</File>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/vs7/example_XSLT_Mangle.vcproj b/vs7/example_XSLT_Mangle.vcproj
index e2d6a486..b83ddc11 100644
--- a/vs7/example_XSLT_Mangle.vcproj
+++ b/vs7/example_XSLT_Mangle.vcproj
@@ -35,10 +35,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
 				OutputFile="$(OutDir)/mangle.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/example_XSLTMangle.pdb"
+				ProgramDatabaseFile="$(OutDir)/mangle.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
@@ -85,6 +86,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica.lib"
 				OutputFile="$(OutDir)/mangle.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -307,9 +309,6 @@
 				</Filter>
 			</Filter>
 		</Filter>
-		<File
-			RelativePath="..\lib\Arabica.lib">
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/vs7/lib_arabica.vcproj b/vs7/lib_arabica.vcproj
index 09e97480..83b376e6 100644
--- a/vs7/lib_arabica.vcproj
+++ b/vs7/lib_arabica.vcproj
@@ -33,9 +33,6 @@
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=""
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="4"
@@ -44,7 +41,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile=".\..\lib\Arabica.lib"
+				OutputFile=".\..\lib\Arabica-debug.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -87,9 +84,6 @@
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release/SAX.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@@ -683,7 +677,7 @@
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="cl /TC /EP  -D USE_LIBXML2 ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.h
+						CommandLine="cl /TC /EP  -D USE_MSXML ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.h
 "
 						Outputs="..\include\SAX\ArabicaConfig.h"/>
 				</FileConfiguration>
@@ -693,7 +687,7 @@
 						Name="VCCustomBuildTool"
 						CommandLine="cl /TC /EP -D USE_MSXML  ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.h
 "
-						Outputs="ArabicaConfig.h"/>
+						Outputs="..\include\SAX\ArabicaConfig.h"/>
 				</FileConfiguration>
 			</File>
 			<Filter
diff --git a/vs7/test_DOM.vcproj b/vs7/test_DOM.vcproj
index 8ce158af..1a012235 100644
--- a/vs7/test_DOM.vcproj
+++ b/vs7/test_DOM.vcproj
@@ -28,12 +28,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile=".\Debug_test_DOM/DOM_test.pch"
-				AssemblerListingLocation=".\Debug_test_DOM/"
-				ObjectFile=".\Debug_test_DOM/"
-				ProgramDataBaseFileName=".\Debug_test_DOM/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="4"
@@ -43,17 +41,16 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wsock32.lib"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
 				OutputFile="$(OutDir)/DOM_test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\..\bin/DOM_test.pdb"
+				ProgramDatabaseFile="$(OutDir)/DOM_test.pdb"
 				SubSystem="1"/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\..\bin/DOM_test.tlb"/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -92,12 +89,10 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile=".\Release_test_DOM/DOM_test.pch"
-				AssemblerListingLocation=".\Release_test_DOM/"
-				ObjectFile=".\Release_test_DOM/"
-				ProgramDataBaseFileName=".\Release_test_DOM/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@@ -105,15 +100,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wsock32.lib"
+				AdditionalDependencies="..\lib\arabica.lib"
 				OutputFile="$(OutDir)/DOM_test.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Release_test_DOM/DOM_test.pdb"
 				SubSystem="1"/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release_test_DOM/DOM_test.tlb"/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -189,12 +182,6 @@
 				RelativePath=".\..\tests\DOM\test_Text.hpp">
 			</File>
 		</Filter>
-		<Filter
-			Name="Libs">
-			<File
-				RelativePath="..\lib\Arabica.lib">
-			</File>
-		</Filter>
 		<Filter
 			Name="CppUnit">
 			<File
diff --git a/vs7/test_DOM_silly.vcproj b/vs7/test_DOM_silly.vcproj
index 931f1926..e8b33f46 100644
--- a/vs7/test_DOM_silly.vcproj
+++ b/vs7/test_DOM_silly.vcproj
@@ -28,12 +28,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile=".\Debug_test_DOM/SAX2DOM_test.pch"
-				AssemblerListingLocation=".\Debug_test_DOM/"
-				ObjectFile=".\Debug_test_DOM/"
-				ProgramDataBaseFileName=".\Debug_test_DOM/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="4"
@@ -43,17 +41,16 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wsock32.lib"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
 				OutputFile="$(OutDir)/DOM_test_silly.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\..\bin/DOM_test_silly.pdb"
+				ProgramDatabaseFile="$(OutDir)/DOM_test_silly.pdb"
 				SubSystem="1"/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\..\bin/DOM_test_silly.tlb"/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -92,12 +89,10 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile=".\Release_test_DOM/DOM_test.pch"
-				AssemblerListingLocation=".\Release_test_DOM/"
-				ObjectFile=".\Release_test_DOM/"
-				ProgramDataBaseFileName=".\Release_test_DOM/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@@ -105,15 +100,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wsock32.lib"
+				AdditionalDependencies="..\lib\arabica.lib"
 				OutputFile="$(OutDir)/DOM_test_silly.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Release_test_DOM/DOM_test_silly.pdb"
 				SubSystem="1"/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release_test_DOM/DOM_test_silly.tlb"/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -195,12 +188,6 @@
 				RelativePath="..\tests\Dom\test_Text.hpp">
 			</File>
 		</Filter>
-		<Filter
-			Name="Libs">
-			<File
-				RelativePath="..\lib\Arabica.lib">
-			</File>
-		</Filter>
 		<Filter
 			Name="CppUnit">
 			<File
diff --git a/vs7/test_DOM_wide.vcproj b/vs7/test_DOM_wide.vcproj
index 9e61b4e1..21742a58 100644
--- a/vs7/test_DOM_wide.vcproj
+++ b/vs7/test_DOM_wide.vcproj
@@ -28,12 +28,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile=".\Debug_test_DOM/SAX2DOM_test.pch"
-				AssemblerListingLocation=".\Debug_test_DOM/"
-				ObjectFile=".\Debug_test_DOM/"
-				ProgramDataBaseFileName=".\Debug_test_DOM/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="4"
@@ -43,17 +41,16 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wsock32.lib"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
 				OutputFile="$(OutDir)/DOM_test_wide.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\..\bin/DOM_test_wide.pdb"
+				ProgramDatabaseFile="$(OutDir)/DOM_test_wide.pdb"
 				SubSystem="1"/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\..\bin/DOM_test_wide.tlb"/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -92,12 +89,10 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile=".\Release_test_DOM/DOM_test.pch"
-				AssemblerListingLocation=".\Release_test_DOM/"
-				ObjectFile=".\Release_test_DOM/"
-				ProgramDataBaseFileName=".\Release_test_DOM/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@@ -105,15 +100,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wsock32.lib"
+				AdditionalDependencies="..\lib\arabica.lib"
 				OutputFile="$(OutDir)/DOM_test_wide.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Release_test_DOM/DOM_test_wide.pdb"
 				SubSystem="1"/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release_test_DOM/DOM_test_wide.tlb"/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -189,12 +182,6 @@
 				RelativePath="..\tests\Dom\test_Text.hpp">
 			</File>
 		</Filter>
-		<Filter
-			Name="Libs">
-			<File
-				RelativePath="..\lib\Arabica.lib">
-			</File>
-		</Filter>
 		<Filter
 			Name="CppUnit">
 			<File
diff --git a/vs7/test_SAX_filter.vcproj b/vs7/test_SAX_filter.vcproj
index ccbd1a23..69045547 100644
--- a/vs7/test_SAX_filter.vcproj
+++ b/vs7/test_SAX_filter.vcproj
@@ -1,160 +1,207 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="test_SAXFilter"
-	ProjectGUID="{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\bin"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="test_SAXFilter"
+	ProjectGUID="{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\bin"
+			IntermediateDirectory=".\Debug_test_SAXFilter"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm200
-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\Debug/Writer.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
-				OutputFile="$(OutDir)/sax_filter_test.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\..\..\bin/Writer.pdb"
-				SubSystem="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\..\..\bin/Writer.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\..\bin"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\Release/Writer.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wsock32.lib"
-				OutputFile="$(OutDir)/sax_filter_test.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Release/Writer.pdb"
-				SubSystem="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/Writer.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
-				AdditionalIncludeDirectories=""/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath=".\test\SAX\FilterTest.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Libs"
-			Filter="lib">
-			<File
-				RelativePath="..\..\lib\Arabica.lib">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Debug/Writer.pch"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
+				OutputFile="$(OutDir)/sax_filter_test.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/sax_filter_test.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="2057"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\bin"
+			IntermediateDirectory=".\Release_test_SAXFilter"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Release/Writer.pch"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="..\lib\arabica.lib"
+				OutputFile="$(OutDir)/sax_filter_test.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2057"
+				AdditionalIncludeDirectories=""/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\tests\Sax\filter_test.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="CppUnit">
+			<File
+				RelativePath="..\tests\CppUnit\framework\CppUnitException.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\estring.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Guards.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Test.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCaller.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.cpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.cpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.cpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.cpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.hpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.cpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.cpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="">
+			<File
+				RelativePath="..\tests\Sax\test_WhitespaceStripper.hpp">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/vs7/test_SAX_filter_silly.vcproj b/vs7/test_SAX_filter_silly.vcproj
new file mode 100644
index 00000000..3a4e6c7f
--- /dev/null
+++ b/vs7/test_SAX_filter_silly.vcproj
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="test_SAXFilter_silly"
+	ProjectGUID="{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\bin"
+			IntermediateDirectory=".\Debug_test_SAXFilter_silly"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm200
+"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
+				OutputFile="$(OutDir)/sax_filter_test_ss.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/sax_filter_test_ss.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="2057"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\bin"
+			IntermediateDirectory=".\Release_test_SAXFilter_silly"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="..\lib\arabica.lib"
+				OutputFile="$(OutDir)/sax_filter_test_ss.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2057"
+				AdditionalIncludeDirectories=""/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\tests\Sax\filter_test_silly.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="CppUnit">
+			<File
+				RelativePath="..\tests\CppUnit\framework\CppUnitException.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\estring.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Guards.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Test.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCaller.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.cpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.cpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.cpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.cpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.hpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.cpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.cpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="">
+			<File
+				RelativePath="..\tests\Sax\test_WhitespaceStripper.hpp">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/vs7/test_SAX_filter_wide.vcproj b/vs7/test_SAX_filter_wide.vcproj
new file mode 100644
index 00000000..b84d52c0
--- /dev/null
+++ b/vs7/test_SAX_filter_wide.vcproj
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="test_SAXFilter_wide"
+	ProjectGUID="{FB5B88E9-DAB3-401C-B413-77403C562C49}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\bin"
+			IntermediateDirectory=".\Debug_test_SAXFilter_wide"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm200
+"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
+				OutputFile="$(OutDir)/sax_filter_test_wide.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/sax_filter_test_wide.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="2057"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\bin"
+			IntermediateDirectory=".\Release_test_SAXFilter_wide"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="..\lib\arabica.lib"
+				OutputFile="$(OutDir)/sax_filter_test_wide.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2057"
+				AdditionalIncludeDirectories=""/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\tests\Sax\filter_test_wide.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="CppUnit">
+			<File
+				RelativePath="..\tests\CppUnit\framework\CppUnitException.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\estring.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Guards.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Test.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCaller.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.cpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.cpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.cpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.cpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.hpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.cpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.h">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.cpp">
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="">
+			<File
+				RelativePath="..\tests\Sax\test_WhitespaceStripper.hpp">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/vs7/test_utils.vcproj b/vs7/test_utils.vcproj
index 4abce8cf..50ac9265 100644
--- a/vs7/test_utils.vcproj
+++ b/vs7/test_utils.vcproj
@@ -38,6 +38,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
 				OutputFile="$(OutDir)/utils_test.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -77,7 +78,7 @@
 				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
-				DisableLanguageExtensions="TRUE"
+				DisableLanguageExtensions="FALSE"
 				TreatWChar_tAsBuiltInType="TRUE"
 				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
@@ -89,6 +90,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica.lib"
 				OutputFile="$(OutDir)/utils_test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -146,12 +148,6 @@
 				RelativePath="..\tests\Utils\util_test_suite.hpp">
 			</File>
 		</Filter>
-		<Filter
-			Name="Libs">
-			<File
-				RelativePath="..\lib\Arabica.lib">
-			</File>
-		</Filter>
 		<Filter
 			Name="CppUnit">
 			<File
diff --git a/vs7/test_xpath.vcproj b/vs7/test_xpath.vcproj
index 50a5c5dd..f4ff5a80 100644
--- a/vs7/test_xpath.vcproj
+++ b/vs7/test_xpath.vcproj
@@ -38,10 +38,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
 				OutputFile="$(OutDir)/xpath_test.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/xpathic.pdb"
+				ProgramDatabaseFile="$(OutDir)/xpath_test.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
@@ -77,7 +78,7 @@
 				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
-				DisableLanguageExtensions="TRUE"
+				DisableLanguageExtensions="FALSE"
 				TreatWChar_tAsBuiltInType="TRUE"
 				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
@@ -89,6 +90,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica.lib"
 				OutputFile="$(OutDir)/xpath_test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -173,12 +175,6 @@
 				RelativePath="..\tests\XPath\xpath_test_suite.hpp">
 			</File>
 		</Filter>
-		<Filter
-			Name="Libs">
-			<File
-				RelativePath="..\lib\Arabica.lib">
-			</File>
-		</Filter>
 		<Filter
 			Name="CppUnit">
 			<File
diff --git a/vs7/test_xpath_silly.vcproj b/vs7/test_xpath_silly.vcproj
index b3bf5b63..77a628ca 100644
--- a/vs7/test_xpath_silly.vcproj
+++ b/vs7/test_xpath_silly.vcproj
@@ -28,7 +28,7 @@
 				RuntimeLibrary="3"
 				DisableLanguageExtensions="FALSE"
 				TreatWChar_tAsBuiltInType="TRUE"
-				ForceConformanceInForLoopScope="FALSE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -38,10 +38,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
 				OutputFile="$(OutDir)/xpath_test_ss.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/xpathic.pdb"
+				ProgramDatabaseFile="$(OutDir)/xpath_test_ss.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
@@ -77,7 +78,7 @@
 				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
-				DisableLanguageExtensions="TRUE"
+				DisableLanguageExtensions="FALSE"
 				TreatWChar_tAsBuiltInType="TRUE"
 				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
@@ -89,6 +90,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica.lib"
 				OutputFile="$(OutDir)/xpath_test_ss.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -177,12 +179,6 @@
 				RelativePath="..\tests\XPath\xpath_test_suite.hpp">
 			</File>
 		</Filter>
-		<Filter
-			Name="Libs">
-			<File
-				RelativePath="..\lib\Arabica.lib">
-			</File>
-		</Filter>
 		<Filter
 			Name="CppUnit">
 			<File
diff --git a/vs7/test_xpath_wide.vcproj b/vs7/test_xpath_wide.vcproj
index 87c329fd..7548638a 100644
--- a/vs7/test_xpath_wide.vcproj
+++ b/vs7/test_xpath_wide.vcproj
@@ -28,7 +28,7 @@
 				RuntimeLibrary="3"
 				DisableLanguageExtensions="FALSE"
 				TreatWChar_tAsBuiltInType="TRUE"
-				ForceConformanceInForLoopScope="FALSE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -38,10 +38,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
 				OutputFile="$(OutDir)/xpath_test_wide.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/xpathic.pdb"
+				ProgramDatabaseFile="$(OutDir)/xpath_test_wide.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
@@ -77,7 +78,7 @@
 				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
-				DisableLanguageExtensions="TRUE"
+				DisableLanguageExtensions="FALSE"
 				TreatWChar_tAsBuiltInType="TRUE"
 				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
@@ -89,6 +90,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica.lib"
 				OutputFile="$(OutDir)/xpath_test_wide.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -171,12 +173,6 @@
 				RelativePath="..\tests\XPath\xpath_test_suite.hpp">
 			</File>
 		</Filter>
-		<Filter
-			Name="Libs">
-			<File
-				RelativePath="..\lib\Arabica.lib">
-			</File>
-		</Filter>
 		<Filter
 			Name="CppUnit">
 			<File
diff --git a/vs7/test_xslt.vcproj b/vs7/test_xslt.vcproj
index e579621f..2829f4a3 100644
--- a/vs7/test_xslt.vcproj
+++ b/vs7/test_xslt.vcproj
@@ -38,6 +38,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
 				OutputFile="$(OutDir)/xslt_test.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -77,7 +78,7 @@
 				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
-				DisableLanguageExtensions="TRUE"
+				DisableLanguageExtensions="FALSE"
 				TreatWChar_tAsBuiltInType="TRUE"
 				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
@@ -89,6 +90,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica.lib"
 				OutputFile="$(OutDir)/xslt_test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -137,12 +139,6 @@
 				RelativePath="..\tests\Xslt\xslt_test.hpp">
 			</File>
 		</Filter>
-		<Filter
-			Name="Libs">
-			<File
-				RelativePath="..\lib\Arabica.lib">
-			</File>
-		</Filter>
 		<Filter
 			Name="CppUnit">
 			<File