diff --git a/HOWTOBUILD b/HOWTOBUILD
index c671a936..71bd1404 100644
--- a/HOWTOBUILD
+++ b/HOWTOBUILD
@@ -16,6 +16,3 @@ Using CMake
 Please see CMake.README
 
 
-Using Visual Studio
--------------------
-See http://www.jezuk.co.uk/arabica/howtobuild
diff --git a/vs10/Arabica.sln b/vs10/Arabica.sln
deleted file mode 100644
index 245bc9f9..00000000
--- a/vs10/Arabica.sln
+++ /dev/null
@@ -1,73 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica.vcxproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_pyx", "example_SAX_pyx.vcxproj", "{5214A867-2768-4CD0-9E29-6EED20718556}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_SimpleHandler", "example_SAX_simplehander.vcxproj", "{4D861155-0183-4637-8F01-4F8FDB43C344}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_writer", "example_SAX_writer.vcxproj", "{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_xmlbase", "example_SAX_xmlbase.vcxproj", "{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_DOM_writer", "example_DOM_writer.vcxproj", "{C1CF7801-1681-4F15-8D71-BBC814805AF2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_Utils_transcode", "example_Utils_transcode.vcxproj", "{436B423B-BF20-4B2E-A187-604AF391FBE2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_XPath_xgrep", "example_XPath_xgrep.vcxproj", "{5F7B038E-5148-4EF4-AB43-5035F666D00D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_XSLT_Mangle", "example_XSLT_Mangle.vcxproj", "{FDF423F0-ACF8-4963-81A4-C886B9174B72}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_Taggle", "example_SAX_Taggle.vcxproj", "{274EB942-0AA8-4715-8419-4722868A22BA}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.Build.0 = Debug|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.ActiveCfg = Release|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.Build.0 = Release|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.Build.0 = Debug|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.ActiveCfg = Release|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.Build.0 = Release|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.Build.0 = Debug|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.ActiveCfg = Release|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.Build.0 = Release|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.Build.0 = Debug|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.ActiveCfg = Release|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.Build.0 = Release|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.Build.0 = Debug|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.ActiveCfg = Release|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.Build.0 = Release|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.Build.0 = Debug|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.ActiveCfg = Release|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.Build.0 = Release|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Debug|Win32.Build.0 = Debug|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Release|Win32.ActiveCfg = Release|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Release|Win32.Build.0 = Release|Win32
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Debug|Win32.Build.0 = Debug|Win32
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Release|Win32.ActiveCfg = Release|Win32
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Release|Win32.Build.0 = Release|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.Build.0 = Debug|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.ActiveCfg = Release|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vs10/Arabica_noboost.sln b/vs10/Arabica_noboost.sln
deleted file mode 100644
index 6b30360f..00000000
--- a/vs10/Arabica_noboost.sln
+++ /dev/null
@@ -1,61 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_pyx", "example_SAX_pyx.vcxproj", "{5214A867-2768-4CD0-9E29-6EED20718556}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_SimpleHandler", "example_SAX_simplehander.vcxproj", "{4D861155-0183-4637-8F01-4F8FDB43C344}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_writer", "example_SAX_writer.vcxproj", "{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_xmlbase", "example_SAX_xmlbase.vcxproj", "{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_DOM_writer", "example_DOM_writer.vcxproj", "{C1CF7801-1681-4F15-8D71-BBC814805AF2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_Utils_transcode", "example_Utils_transcode.vcxproj", "{436B423B-BF20-4B2E-A187-604AF391FBE2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica_noboost.vcproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_Taggle", "example_SAX_Taggle.vcxproj", "{274EB942-0AA8-4715-8419-4722868A22BA}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.Build.0 = Debug|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.ActiveCfg = Release|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.Build.0 = Release|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.Build.0 = Debug|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.ActiveCfg = Release|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.Build.0 = Release|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.Build.0 = Debug|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.ActiveCfg = Release|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.Build.0 = Release|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.Build.0 = Debug|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.ActiveCfg = Release|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.Build.0 = Release|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.Build.0 = Debug|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.ActiveCfg = Release|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.Build.0 = Release|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.Build.0 = Debug|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.ActiveCfg = Release|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.Build.0 = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.Build.0 = Debug|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.ActiveCfg = Release|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vs10/Arabica_noboost_tests.sln b/vs10/Arabica_noboost_tests.sln
deleted file mode 100644
index 45db68f7..00000000
--- a/vs10/Arabica_noboost_tests.sln
+++ /dev/null
@@ -1,102 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM", "test_DOM.vcproj", "{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-		{FB5B88E9-DAB3-401C-B413-77403C562C49} = {FB5B88E9-DAB3-401C-B413-77403C562C49}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_silly", "test_DOM_silly.vcproj", "{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-		{FB5B88E9-DAB3-401C-B413-77403C562C49} = {FB5B88E9-DAB3-401C-B413-77403C562C49}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_wide", "test_DOM_wide.vcproj", "{DE6FD811-12BD-4914-BA29-CD987C4B0D48}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C} = {7D957E35-93D3-4C9E-A5EF-4B0620CE758C}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-		{FB5B88E9-DAB3-401C-B413-77403C562C49} = {FB5B88E9-DAB3-401C-B413-77403C562C49}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_utils", "test_utils.vcproj", "{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter", "test_SAX_filter.vcproj", "{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_silly", "test_SAX_filter_silly.vcproj", "{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_wide", "test_SAX_filter_wide.vcproj", "{FB5B88E9-DAB3-401C-B413-77403C562C49}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica_noboost.vcproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.Build.0 = Debug|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.ActiveCfg = Release|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.Build.0 = Release|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.Build.0 = Debug|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.ActiveCfg = Release|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.Build.0 = Release|Win32
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|Win32.ActiveCfg = Debug|Win32
-		{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
-		{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
-		{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
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vs10/Arabica_tests.sln b/vs10/Arabica_tests.sln
deleted file mode 100644
index dadef1e8..00000000
--- a/vs10/Arabica_tests.sln
+++ /dev/null
@@ -1,91 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica.vcxproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM", "test_DOM.vcxproj", "{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnitLib", "CppUnitLib.vcxproj", "{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_silly", "test_DOM_silly.vcxproj", "{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}"
-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
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.Build.0 = Debug|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.ActiveCfg = Release|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.Build.0 = Release|Win32
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|Win32.Build.0 = Debug|Win32
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|Win32.ActiveCfg = Release|Win32
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|Win32.Build.0 = Release|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.Build.0 = Debug|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.ActiveCfg = Release|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.Build.0 = Release|Win32
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|Win32.ActiveCfg = Debug|Win32
-		{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
-	EndGlobalSection
-EndGlobal
diff --git a/vs10/CppUnitLib.vcxproj b/vs10/CppUnitLib.vcxproj
deleted file mode 100644
index 9409d054..00000000
--- a/vs10/CppUnitLib.vcxproj
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}</ProjectGuid>
-    <RootNamespace>CppUnitLib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_CppUnit\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_CppUnit\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CppUnit-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CppUnit</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>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(TargetName).lib  </OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\CppUnit\textui\TableTestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestCase.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestFailure.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\TestRunner.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestSuite.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TextTestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\XmlTestResult.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\CppUnit\TestRunner.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\CppUnitException.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\estring.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\Guards.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TableTestResult.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\Test.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCaller.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCase.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestFailure.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestSuite.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TextTestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\XmlTestResult.hpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/example_DOM_writer.vcxproj b/vs10/example_DOM_writer.vcxproj
deleted file mode 100644
index 4ba6c9b8..00000000
--- a/vs10/example_DOM_writer.vcxproj
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C1CF7801-1681-4F15-8D71-BBC814805AF2}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_examples_DOM_writer\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_examples_DOM_writer\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>DOMWriter</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>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Dom\DOMWriter.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/example_SAX_Taggle.vcxproj b/vs10/example_SAX_Taggle.vcxproj
deleted file mode 100644
index 16bbb3bb..00000000
--- a/vs10/example_SAX_Taggle.vcxproj
+++ /dev/null
@@ -1,114 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{274EB942-0AA8-4715-8419-4722868A22BA}</ProjectGuid>
-    <RootNamespace>example_SAX_Taggle</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_example_SAX_taggle\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_example_SAX_taggle\</IntDir>
-    <TargetName>taggle</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>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>.\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Taggle\taggle.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="example_SAX_pyx.vcxproj">
-      <Project>{5214a867-2768-4cd0-9e29-6eed20718556}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="example_SAX_simplehander.vcxproj">
-      <Project>{4d861155-0183-4637-8f01-4f8fdb43c344}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/example_SAX_pyx.vcxproj b/vs10/example_SAX_pyx.vcxproj
deleted file mode 100644
index effa87d3..00000000
--- a/vs10/example_SAX_pyx.vcxproj
+++ /dev/null
@@ -1,133 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5214A867-2768-4CD0-9E29-6EED20718556}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_examples_SAX_pyx\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_examples_SAX_pyx\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>pyx</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>
-      <AdditionalOptions>/Zm200
- %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Debug_examples_SAX_pyx/pyx.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Release_examples_SAX_pyx/pyx.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release_examples_SAX_pyx/</AssemblerListingLocation>
-      <ObjectFileName>.\Release_examples_SAX_pyx/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release_examples_SAX_pyx/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Sax\pyx.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/example_SAX_simplehander.vcxproj b/vs10/example_SAX_simplehander.vcxproj
deleted file mode 100644
index 8bda4d3c..00000000
--- a/vs10/example_SAX_simplehander.vcxproj
+++ /dev/null
@@ -1,137 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>example_SAX_SimpleHandler</ProjectName>
-    <ProjectGuid>{4D861155-0183-4637-8F01-4F8FDB43C344}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_examples_SAX_simple\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_examples_SAX_simple\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>simplehandler</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>
-      <AdditionalOptions>/Zm200
- %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Release/SimpleHandler.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
-      <ObjectFileName>.\Release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Sax\SimpleHandler.cpp" />
-    <ClCompile Include="..\examples\Sax\wrapper.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\examples\Sax\SimpleHandler.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/example_SAX_writer.vcxproj b/vs10/example_SAX_writer.vcxproj
deleted file mode 100644
index 4f220daa..00000000
--- a/vs10/example_SAX_writer.vcxproj
+++ /dev/null
@@ -1,132 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_examples_SAX_writer\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_examples_SAX_writer\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>Writer</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>
-      <AdditionalOptions>/Zm200
- %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Debug/Writer.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Release/Writer.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
-      <ObjectFileName>.\Release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Sax\writer.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/example_SAX_xmlbase.vcxproj b/vs10/example_SAX_xmlbase.vcxproj
deleted file mode 100644
index 7832d612..00000000
--- a/vs10/example_SAX_xmlbase.vcxproj
+++ /dev/null
@@ -1,114 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_examples_SAX_xmlbase\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_examples_SAX_xmlbase\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>xmlbase</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>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Sax\xmlbase.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/example_Utils_transcode.vcxproj b/vs10/example_Utils_transcode.vcxproj
deleted file mode 100644
index e0532eb6..00000000
--- a/vs10/example_Utils_transcode.vcxproj
+++ /dev/null
@@ -1,119 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{436B423B-BF20-4B2E-A187-604AF391FBE2}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_example_Utils_transcode\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_example_Utils_transcode\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>transcode</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>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Utils\transcode.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/example_XPath_xgrep.vcxproj b/vs10/example_XPath_xgrep.vcxproj
deleted file mode 100644
index 5c421b23..00000000
--- a/vs10/example_XPath_xgrep.vcxproj
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5F7B038E-5148-4EF4-AB43-5035F666D00D}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_example_xpath_xgrep\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_example_xpath_xgrep\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>xgrep</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>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\XPath\xgrep.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="example_DOM_writer.vcxproj">
-      <Project>{c1cf7801-1681-4f15-8d71-bbc814805af2}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/example_XSLT_Mangle.vcxproj b/vs10/example_XSLT_Mangle.vcxproj
deleted file mode 100644
index a57a96ba..00000000
--- a/vs10/example_XSLT_Mangle.vcxproj
+++ /dev/null
@@ -1,189 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{FDF423F0-ACF8-4963-81A4-C886B9174B72}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug_example_XSLT_mangle\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release_example_XSLT_mangle\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>mangle</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>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Xslt\mangle.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\Xslt\XSLT.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_apply_imports.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_apply_templates.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_attribute.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_call_template.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_choose.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_comment.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_compilation_context.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_compiled_stylesheet.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_copy.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_element.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_execution_context.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_for_each.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_functions.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_if.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_inline_element.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_item.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_key.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_message.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_namespace_stack.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_output.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_param.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_precedence.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_processing_instruction.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_qname.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_sink.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_sort.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_stylesheet.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_stylesheet_compiler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_template.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_text.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_top_level_param.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_value_of.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_variable.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_variable_impl.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_variable_stack.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_with_param.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_apply_imports_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_apply_templates_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_attribute_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_call_template_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_choose_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_comment_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_copy_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_create_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_element_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_for_each_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_if_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_include_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_inline_element_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_item_container_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_key_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_message_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_namespace_alias_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_output_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_processing_instruction_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_sort_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_template_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_text_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_value_of_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_value_validation.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_variable_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_with_param_handler.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\tests\XSLT\TO-DO" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="example_XPath_xgrep.vcxproj">
-      <Project>{5f7b038e-5148-4ef4-ab43-5035f666d00d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/lib_arabica.vcxproj b/vs10/lib_arabica.vcxproj
deleted file mode 100644
index f0fc1695..00000000
--- a/vs10/lib_arabica.vcxproj
+++ /dev/null
@@ -1,385 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>ArabicaLib</ProjectName>
-    <ProjectGuid>{4CA72415-D03A-4447-BE4E-C093A5146CAC}</ProjectGuid>
-    <RootNamespace>ArabicaLib</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_Arabica\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_Arabica\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Arabica-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Arabica</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>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
-      <ObjectFileName>.\Debug/</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(TargetName).lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Release/SAX.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
-      <ObjectFileName>.\Release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(TargetName).lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\Sax\AttributeList.hpp" />
-    <ClInclude Include="..\include\Sax\Attributes.hpp" />
-    <ClInclude Include="..\include\Sax\ContentHandler.hpp" />
-    <ClInclude Include="..\include\Sax\DocumentHandler.hpp" />
-    <ClInclude Include="..\include\Sax\DTDHandler.hpp" />
-    <ClInclude Include="..\include\Sax\EntityResolver.hpp" />
-    <ClInclude Include="..\include\Sax\ErrorHandler.hpp" />
-    <ClInclude Include="..\include\Sax\HandlerBase.hpp" />
-    <ClInclude Include="..\include\Sax\InputSource.hpp" />
-    <ClInclude Include="..\include\Sax\IStreamHandle.hpp" />
-    <ClInclude Include="..\include\Sax\Locator.hpp" />
-    <ClInclude Include="..\include\Sax\Parser.hpp" />
-    <ClInclude Include="..\include\Sax\ParserConfig.hpp" />
-    <ClInclude Include="..\include\Sax\SAXException.hpp" />
-    <ClInclude Include="..\include\Sax\saxfwd.hpp" />
-    <ClInclude Include="..\include\Sax\SAXNotRecognizedException.hpp" />
-    <ClInclude Include="..\include\Sax\SAXNotSupportedException.hpp" />
-    <ClInclude Include="..\include\Sax\SAXParseException.hpp" />
-    <ClInclude Include="..\include\Sax\XMLFilter.hpp" />
-    <ClInclude Include="..\include\Sax\XMLReader.hpp" />
-    <ClInclude Include="..\include\Sax\ext\Attributes2.hpp" />
-    <ClInclude Include="..\include\Sax\ext\DeclHandler.hpp" />
-    <ClInclude Include="..\include\Sax\ext\DefaultHandler2.hpp" />
-    <ClInclude Include="..\include\Sax\ext\LexicalHandler.hpp" />
-    <ClInclude Include="..\include\Sax\ext\Locator2.hpp" />
-    <ClInclude Include="..\include\Sax\ext\ProgressiveParser.hpp" />
-    <ClInclude Include="..\include\Sax\filter\NamespaceTracker.hpp" />
-    <ClInclude Include="..\include\Sax\filter\TextCoalescer.hpp" />
-    <ClInclude Include="..\include\Sax\filter\TextOnly.hpp" />
-    <ClInclude Include="..\include\Sax\filter\Writer.hpp" />
-    <ClInclude Include="..\include\Sax\filter\XMLBaseTracker.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\AttributeDefaults.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\AttributeListImpl.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\AttributesImpl.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\AttributeTypes.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\CatchErrorHandler.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\DefaultHandler.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\FeatureNames.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\InputSourceResolver.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\LocatorImpl.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\NamespaceSupport.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\XMLBaseSupport.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\XMLFilterImpl.hpp" />
-    <ClInclude Include="..\include\Sax\parsers\saxgarden.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\saxexpat.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\saxlibxml2.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\saxmsxml2.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\saxxerces.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\XercesFeatureNames.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\XercesPropertyNames.hpp" />
-    <ClInclude Include="..\include\Dom\Attr.hpp" />
-    <ClInclude Include="..\include\Dom\CDATASection.hpp" />
-    <ClInclude Include="..\include\Dom\CharacterData.hpp" />
-    <ClInclude Include="..\include\Dom\Comment.hpp" />
-    <ClInclude Include="..\include\Dom\Document.hpp" />
-    <ClInclude Include="..\include\Dom\DocumentFragment.hpp" />
-    <ClInclude Include="..\include\Dom\DocumentType.hpp" />
-    <ClInclude Include="..\include\Dom\DOMException.hpp" />
-    <ClInclude Include="..\include\Dom\DOMImplementation.hpp" />
-    <ClInclude Include="..\include\Dom\Element.hpp" />
-    <ClInclude Include="..\include\Dom\Entity.hpp" />
-    <ClInclude Include="..\include\Dom\EntityReference.hpp" />
-    <ClInclude Include="..\include\Dom\NamedNodeMap.hpp" />
-    <ClInclude Include="..\include\Dom\Node.hpp" />
-    <ClInclude Include="..\include\Dom\NodeList.hpp" />
-    <ClInclude Include="..\include\Dom\Notation.hpp" />
-    <ClInclude Include="..\include\Dom\ProcessingInstruction.hpp" />
-    <ClInclude Include="..\include\Dom\Proxy.hpp" />
-    <ClInclude Include="..\include\Dom\Text.hpp" />
-    <ClInclude Include="..\include\Dom\DualMode\DualMode.hpp" />
-    <ClInclude Include="..\include\Dom\Events\DocumentEvent.hpp" />
-    <ClInclude Include="..\include\Dom\Events\Event.hpp" />
-    <ClInclude Include="..\include\Dom\Events\EventException.hpp" />
-    <ClInclude Include="..\include\Dom\Events\EventListener.hpp" />
-    <ClInclude Include="..\include\Dom\Events\EventTarget.hpp" />
-    <ClInclude Include="..\include\Dom\Events\MutationEvent.hpp" />
-    <ClInclude Include="..\include\Dom\Sax2dom\DocumentTypeImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Sax2dom\SAX2DOM.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\AttrImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\AttrMap.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\AttrNSImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\CDATASectionImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\CharacterDataImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\CommentImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\DocumentFragmentImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\DocumentImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\DocumentTypeImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\DOMImplementation.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\ElementByTagImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\ElementImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\ElementNSImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\EntityImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\EntityReferenceImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\Helpers.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\NamedNodeMapImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\NodeImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\NotationImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\ProcessingInstructionImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\TextImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\DocumentTraversal.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\DocumentTraversalImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\NodeFilter.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\NodeIterator.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\TraversalImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\TreeWalker.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\TreeWalkerImpl.hpp" />
-    <ClInclude Include="..\include\Dom\io\Stream.hpp" />
-    <ClInclude Include="..\include\XPath\XPath.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_arithmetic.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_ast.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_ast_ids.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_axis_enumerator.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_compile_context.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_execution_context.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_expression.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_expression_impl.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_function.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_function_holder.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_function_resolver.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_grammar.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_logical.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_match.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_match_rewrite.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_namespace_context.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_namespace_node.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_node_test.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_object.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_parser.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_relational.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_resolver_holder.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_step.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_union.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_value.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_variable.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_variable_resolver.hpp" />
-    <ClInclude Include="..\include\Arabica\getparam.hpp" />
-    <ClInclude Include="..\include\Arabica\StringAdaptor.hpp" />
-    <ClInclude Include="..\include\Arabica\stringadaptortag.hpp" />
-    <ClInclude Include="..\include\Arabica\impl\VS6Workaround.hpp" />
-    <ClInclude Include="..\include\Xml\escaper.hpp" />
-    <ClInclude Include="..\include\XML\QName.hpp" />
-    <ClInclude Include="..\include\XML\strings.hpp" />
-    <ClInclude Include="..\include\Xml\XMLCharacterClasses.hpp" />
-    <ClInclude Include="..\include\io\convert_adaptor.hpp" />
-    <ClInclude Include="..\include\io\convertstream.hpp" />
-    <ClInclude Include="..\include\io\socket_stream.hpp" />
-    <ClInclude Include="..\include\io\uri.hpp" />
-    <ClInclude Include="..\include\convert\base64codecvt.hpp" />
-    <ClInclude Include="..\include\convert\impl\codecvt_specialisations.hpp" />
-    <ClInclude Include="..\include\convert\impl\iso88591_utf8.hpp" />
-    <ClInclude Include="..\include\convert\iso88591utf8codecvt.hpp" />
-    <ClInclude Include="..\include\convert\rot13codecvt.hpp" />
-    <ClInclude Include="..\include\convert\impl\ucs2_utf16.hpp" />
-    <ClInclude Include="..\include\convert\impl\ucs2_utf8.hpp" />
-    <ClInclude Include="..\include\convert\ucs2utf8codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf16beucs2codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf16leucs2codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf16utf8codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf8iso88591codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf8ucs2codecvt.hpp" />
-    <ClInclude Include="..\include\text\normalize_whitespace.hpp" />
-    <ClInclude Include="..\include\text\UnicodeCharacters.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\Element.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\ElementType.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\html\HTMLModels.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\html\HTMLScanner.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\html\HTMLSchema.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\Parser.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\ScanHandler.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\Scanner.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\Schema.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\SchemaImpl.hpp" />
-    <ClInclude Include="..\include\Taggle\Taggle.hpp" />
-    <ClInclude Include="..\include\XSLT\XSLT.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_apply_imports.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_apply_templates.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_attribute.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_call_template.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_choose.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_comment.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_compilation_context.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_compiled_stylesheet.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_copy.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_element.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_execution_context.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_for_each.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_functions.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_if.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_inline_element.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_item.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_key.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_message.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_namespace_stack.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_output.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_param.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_precedence.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_processing_instruction.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_qname.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_sink.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_sort.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_stylesheet.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_stylesheet_compiler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_stylesheet_parser.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_template.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_text.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_top_level_param.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_value_of.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_variable.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_variable_impl.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_variable_stack.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_with_param.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_apply_imports_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_apply_templates_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_attribute_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_call_template_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_choose_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_comment_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_constants.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_copy_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_create_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_element_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_for_each_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_if_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_include_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_inline_element_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_item_container_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_key_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_message_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_namespace_alias_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_output_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_processing_instruction_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_sort_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_strip_space_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_template_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_text_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_value_of_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_value_validation.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_variable_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_with_param_handler.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\arabica.cpp" />
-    <ClCompile Include="..\src\XML\XMLCharacterClasses.cpp" />
-    <ClCompile Include="..\src\SAX\helpers\InputSourceResolver.cpp" />
-    <ClCompile Include="..\src\io\uri.cpp" />
-    <ClCompile Include="..\src\convert\base64codecvt.cpp" />
-    <ClCompile Include="..\src\convert\impl\iso88591_utf8.cpp" />
-    <ClCompile Include="..\src\convert\iso88591utf8codecvt.cpp" />
-    <ClCompile Include="..\src\convert\rot13codecvt.cpp" />
-    <ClCompile Include="..\src\convert\impl\ucs2_utf16.cpp" />
-    <ClCompile Include="..\src\convert\impl\ucs2_utf8.cpp" />
-    <ClCompile Include="..\src\convert\ucs2utf8codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf16beucs2codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf16leucs2codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf16utf8codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf8iso88591codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf8ucs2codecvt.cpp" />
-    <ClCompile Include="..\src\taggle\Schema.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\vs7\ArabicaConfig.S">
-      <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
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\SAX\ArabicaConfig.hpp;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs10/test_DOM.vcxproj b/vs10/test_DOM.vcxproj
deleted file mode 100644
index 90b2503d..00000000
--- a/vs10/test_DOM.vcxproj
+++ /dev/null
@@ -1,149 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_DOM\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_DOM\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>DOM_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>
-      <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Debug_test_DOM/DOM_test.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Release_test_DOM/DOM_test.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release_test_DOM/</AssemblerListingLocation>
-      <ObjectFileName>.\Release_test_DOM/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release_test_DOM/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\DOM\main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\DOM\dom_conf_test.hpp" />
-    <ClInclude Include="..\tests\DOM\dom_test_suite.hpp" />
-    <ClInclude Include="..\tests\DOM\test_Attribute.hpp" />
-    <ClInclude Include="..\tests\DOM\test_CDATA.hpp" />
-    <ClInclude Include="..\tests\DOM\test_CharacterData.hpp" />
-    <ClInclude Include="..\tests\DOM\test_Document.hpp" />
-    <ClInclude Include="..\tests\DOM\test_DocumentFragment.hpp" />
-    <ClInclude Include="..\tests\DOM\test_DocumentType.hpp" />
-    <ClInclude Include="..\tests\DOM\test_DOMImplementation.hpp" />
-    <ClInclude Include="..\tests\DOM\test_Element.hpp" />
-    <ClInclude Include="..\tests\DOM\test_NamedNodeMap.hpp" />
-    <ClInclude Include="..\tests\DOM\test_ProcessingInstruction.hpp" />
-    <ClInclude Include="..\tests\Dom\test_SAX2DOM.hpp" />
-    <ClInclude Include="..\tests\DOM\test_Siblings.hpp" />
-    <ClInclude Include="..\tests\DOM\test_Text.hpp" />
-    <ClInclude Include="..\tests\DOM\test_TreeWalker.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/test_DOM_silly.vcxproj b/vs10/test_DOM_silly.vcxproj
deleted file mode 100644
index 7916ea5b..00000000
--- a/vs10/test_DOM_silly.vcxproj
+++ /dev/null
@@ -1,156 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_DOM_silly\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_DOM_silly\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>DOM_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>
-      <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Debug_test_DOM/SAX2DOM_test.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Release_test_DOM/DOM_test.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release_test_DOM/</AssemblerListingLocation>
-      <ObjectFileName>.\Release_test_DOM/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release_test_DOM/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ProgramDatabaseFile>.\Release_test_DOM/$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\DOM\main_silly.cpp" />
-    <ClCompile Include="..\tests\silly_string\silly_string.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Dom\dom_test_suite.hpp" />
-    <ClInclude Include="..\tests\silly_string\silly_string.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Attribute.hpp" />
-    <ClInclude Include="..\tests\Dom\test_CDATA.hpp" />
-    <ClInclude Include="..\tests\Dom\test_CharacterData.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Document.hpp" />
-    <ClInclude Include="..\tests\Dom\test_DocumentFragment.hpp" />
-    <ClInclude Include="..\tests\Dom\test_DocumentType.hpp" />
-    <ClInclude Include="..\tests\Dom\test_DOMImplementation.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Element.hpp" />
-    <ClInclude Include="..\tests\Dom\test_ProcessingInstruction.hpp" />
-    <ClInclude Include="..\tests\Dom\test_SAX2DOM.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Siblings.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Text.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_utils.vcxproj">
-      <Project>{fa1a13a0-07d3-4fc9-a2d2-9f5fa8c3c3a4}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/test_DOM_wide.vcxproj b/vs10/test_DOM_wide.vcxproj
deleted file mode 100644
index 05afe427..00000000
--- a/vs10/test_DOM_wide.vcxproj
+++ /dev/null
@@ -1,158 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DE6FD811-12BD-4914-BA29-CD987C4B0D48}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_DOM\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_DOM_wide\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>DOM_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>
-      <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Debug_test_DOM/SAX2DOM_test.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Release_test_DOM/DOM_test.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release_test_DOM/</AssemblerListingLocation>
-      <ObjectFileName>.\Release_test_DOM/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release_test_DOM/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\DOM\main_wide.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\DOM\dom_test_suite.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Attribute.hpp" />
-    <ClInclude Include="..\tests\Dom\test_CDATA.hpp" />
-    <ClInclude Include="..\tests\Dom\test_CharacterData.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Document.hpp" />
-    <ClInclude Include="..\tests\Dom\test_DocumentFragment.hpp" />
-    <ClInclude Include="..\tests\Dom\test_DocumentType.hpp" />
-    <ClInclude Include="..\tests\Dom\test_DOMImplementation.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Element.hpp" />
-    <ClInclude Include="..\tests\Dom\test_ProcessingInstruction.hpp" />
-    <ClInclude Include="..\tests\Dom\test_SAX2DOM.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Siblings.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Text.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM_silly.vcxproj">
-      <Project>{7d957e35-93d3-4c9e-a5ef-4b0620ce758c}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_utils.vcxproj">
-      <Project>{fa1a13a0-07d3-4fc9-a2d2-9f5fa8c3c3a4}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/test_SAX_filter.vcxproj b/vs10/test_SAX_filter.vcxproj
deleted file mode 100644
index 276953a5..00000000
--- a/vs10/test_SAX_filter.vcxproj
+++ /dev/null
@@ -1,140 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_SAXFilter\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\</OutDir>
-    <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>
-      <AdditionalOptions>/Zm200
- %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Debug/Writer.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Release/Writer.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\Sax\filter_test.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Sax\test_WhitespaceStripper.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_utils.vcxproj">
-      <Project>{fa1a13a0-07d3-4fc9-a2d2-9f5fa8c3c3a4}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/test_SAX_filter_silly.vcxproj b/vs10/test_SAX_filter_silly.vcxproj
deleted file mode 100644
index 77c3bd95..00000000
--- a/vs10/test_SAX_filter_silly.vcxproj
+++ /dev/null
@@ -1,134 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_SAXFilter_silly\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\</OutDir>
-    <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>
-      <AdditionalOptions>/Zm200
- %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\Sax\filter_test_silly.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Sax\test_WhitespaceStripper.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/test_SAX_filter_wide.vcxproj b/vs10/test_SAX_filter_wide.vcxproj
deleted file mode 100644
index ae02a485..00000000
--- a/vs10/test_SAX_filter_wide.vcxproj
+++ /dev/null
@@ -1,134 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{FB5B88E9-DAB3-401C-B413-77403C562C49}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_SAXFilter_wide\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\</OutDir>
-    <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>
-      <AdditionalOptions>/Zm200
- %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\Sax\filter_test_wide.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Sax\test_WhitespaceStripper.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/test_utils.vcxproj b/vs10/test_utils.vcxproj
deleted file mode 100644
index 2b35bb84..00000000
--- a/vs10/test_utils.vcxproj
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_utils\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <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>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>true</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\Utils\utils_test.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Utils\test_base64.hpp" />
-    <ClInclude Include="..\tests\Utils\test_normalize_whitespace.hpp" />
-    <ClInclude Include="..\tests\Utils\test_qname.hpp" />
-    <ClInclude Include="..\tests\Utils\test_uri.hpp" />
-    <ClInclude Include="..\tests\Utils\test_xml_strings.hpp" />
-    <ClInclude Include="..\tests\Utils\util_test_suite.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/test_xpath.vcxproj b/vs10/test_xpath.vcxproj
deleted file mode 100644
index 080e04d1..00000000
--- a/vs10/test_xpath.vcxproj
+++ /dev/null
@@ -1,142 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_xpath\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_xpath\</IntDir>
-    <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>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\XPath\main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\XPath\arithmetic_test.hpp" />
-    <ClInclude Include="..\tests\XPath\attr_value_test.hpp" />
-    <ClInclude Include="..\tests\XPath\axis_enumerator_test.hpp" />
-    <ClInclude Include="..\tests\XPath\execute_test.hpp" />
-    <ClInclude Include="..\tests\XPath\expression_test.hpp" />
-    <ClInclude Include="..\tests\XPath\logical_test.hpp" />
-    <ClInclude Include="..\tests\XPath\match_test.hpp" />
-    <ClInclude Include="..\tests\XPath\node_test_test.hpp" />
-    <ClInclude Include="..\tests\XPath\parse_test.hpp" />
-    <ClInclude Include="..\tests\XPath\relational_test.hpp" />
-    <ClInclude Include="..\tests\XPath\step_test.hpp" />
-    <ClInclude Include="..\tests\XPath\text_node_test.hpp" />
-    <ClInclude Include="..\tests\XPath\value_test.hpp" />
-    <ClInclude Include="..\tests\XPath\xpath_test_suite.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/test_xpath_silly.vcxproj b/vs10/test_xpath_silly.vcxproj
deleted file mode 100644
index 68764eb5..00000000
--- a/vs10/test_xpath_silly.vcxproj
+++ /dev/null
@@ -1,146 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{92BC362C-4B23-4444-A9A8-81933D01D283}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_xpath_silly\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <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>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\XPath\main_silly.cpp" />
-    <ClCompile Include="..\tests\silly_string\silly_string.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\XPath\arithmetic_test.hpp" />
-    <ClInclude Include="..\tests\XPath\attr_value_test.hpp" />
-    <ClInclude Include="..\tests\XPath\axis_enumerator_test.hpp" />
-    <ClInclude Include="..\tests\XPath\execute_test.hpp" />
-    <ClInclude Include="..\tests\XPath\expression_test.hpp" />
-    <ClInclude Include="..\tests\XPath\logical_test.hpp" />
-    <ClInclude Include="..\tests\XPath\match_test.hpp" />
-    <ClInclude Include="..\tests\XPath\node_test_test.hpp" />
-    <ClInclude Include="..\tests\XPath\parse_test.hpp" />
-    <ClInclude Include="..\tests\XPath\relational_test.hpp" />
-    <ClInclude Include="..\tests\silly_string\silly_string.hpp" />
-    <ClInclude Include="..\tests\XPath\step_test.hpp" />
-    <ClInclude Include="..\tests\XPath\value_test.hpp" />
-    <ClInclude Include="..\tests\XPath\xpath_test_suite.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_xpath.vcxproj">
-      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/test_xpath_wide.vcxproj b/vs10/test_xpath_wide.vcxproj
deleted file mode 100644
index 6b56ad16..00000000
--- a/vs10/test_xpath_wide.vcxproj
+++ /dev/null
@@ -1,144 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_xpath_wide\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <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>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\XPath\main_wide.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\XPath\arithmetic_test.hpp" />
-    <ClInclude Include="..\tests\XPath\attr_value_test.hpp" />
-    <ClInclude Include="..\tests\XPath\axis_enumerator_test.hpp" />
-    <ClInclude Include="..\tests\XPath\execute_test.hpp" />
-    <ClInclude Include="..\tests\XPath\expression_test.hpp" />
-    <ClInclude Include="..\tests\XPath\logical_test.hpp" />
-    <ClInclude Include="..\tests\XPath\match_test.hpp" />
-    <ClInclude Include="..\tests\XPath\node_test_test.hpp" />
-    <ClInclude Include="..\tests\XPath\parse_test.hpp" />
-    <ClInclude Include="..\tests\XPath\relational_test.hpp" />
-    <ClInclude Include="..\tests\XPath\step_test.hpp" />
-    <ClInclude Include="..\tests\XPath\value_test.hpp" />
-    <ClInclude Include="..\tests\XPath\xpath_test_suite.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_xpath.vcxproj">
-      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs10/test_xslt.vcxproj b/vs10/test_xslt.vcxproj
deleted file mode 100644
index 4ff84bb8..00000000
--- a/vs10/test_xslt.vcxproj
+++ /dev/null
@@ -1,141 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{44BA3424-C58E-4A49-ADDD-6180C61E5E34}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_xslt\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_xslt\</IntDir>
-    <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>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>NotSet</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>
-      </OptimizeReferences>
-      <EnableCOMDATFolding>
-      </EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>NotSet</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\Xslt\main.cpp" />
-    <ClCompile Include="..\tests\XSLT\xslt_test.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Xslt\xslt_test.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\tests\XSLT\testsuite\TESTS\arabica-catalog.xml" />
-    <None Include="..\tests\Xslt\testsuite\Tests\arabica-expected-fails.xml" />
-    <None Include="..\tests\Xslt\testsuite\Tests\catalog.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_xpath.vcxproj">
-      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/Arabica.sln b/vs2012/Arabica.sln
deleted file mode 100644
index 245bc9f9..00000000
--- a/vs2012/Arabica.sln
+++ /dev/null
@@ -1,73 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica.vcxproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_pyx", "example_SAX_pyx.vcxproj", "{5214A867-2768-4CD0-9E29-6EED20718556}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_SimpleHandler", "example_SAX_simplehander.vcxproj", "{4D861155-0183-4637-8F01-4F8FDB43C344}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_writer", "example_SAX_writer.vcxproj", "{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_xmlbase", "example_SAX_xmlbase.vcxproj", "{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_DOM_writer", "example_DOM_writer.vcxproj", "{C1CF7801-1681-4F15-8D71-BBC814805AF2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_Utils_transcode", "example_Utils_transcode.vcxproj", "{436B423B-BF20-4B2E-A187-604AF391FBE2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_XPath_xgrep", "example_XPath_xgrep.vcxproj", "{5F7B038E-5148-4EF4-AB43-5035F666D00D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_XSLT_Mangle", "example_XSLT_Mangle.vcxproj", "{FDF423F0-ACF8-4963-81A4-C886B9174B72}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_Taggle", "example_SAX_Taggle.vcxproj", "{274EB942-0AA8-4715-8419-4722868A22BA}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.Build.0 = Debug|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.ActiveCfg = Release|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.Build.0 = Release|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.Build.0 = Debug|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.ActiveCfg = Release|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.Build.0 = Release|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.Build.0 = Debug|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.ActiveCfg = Release|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.Build.0 = Release|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.Build.0 = Debug|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.ActiveCfg = Release|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.Build.0 = Release|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.Build.0 = Debug|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.ActiveCfg = Release|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.Build.0 = Release|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.Build.0 = Debug|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.ActiveCfg = Release|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.Build.0 = Release|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Debug|Win32.Build.0 = Debug|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Release|Win32.ActiveCfg = Release|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Release|Win32.Build.0 = Release|Win32
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Debug|Win32.Build.0 = Debug|Win32
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Release|Win32.ActiveCfg = Release|Win32
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Release|Win32.Build.0 = Release|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.Build.0 = Debug|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.ActiveCfg = Release|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vs2012/Arabica_noboost.sln b/vs2012/Arabica_noboost.sln
deleted file mode 100644
index 6b30360f..00000000
--- a/vs2012/Arabica_noboost.sln
+++ /dev/null
@@ -1,61 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_pyx", "example_SAX_pyx.vcxproj", "{5214A867-2768-4CD0-9E29-6EED20718556}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_SimpleHandler", "example_SAX_simplehander.vcxproj", "{4D861155-0183-4637-8F01-4F8FDB43C344}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_writer", "example_SAX_writer.vcxproj", "{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_xmlbase", "example_SAX_xmlbase.vcxproj", "{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_DOM_writer", "example_DOM_writer.vcxproj", "{C1CF7801-1681-4F15-8D71-BBC814805AF2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_Utils_transcode", "example_Utils_transcode.vcxproj", "{436B423B-BF20-4B2E-A187-604AF391FBE2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica_noboost.vcproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_Taggle", "example_SAX_Taggle.vcxproj", "{274EB942-0AA8-4715-8419-4722868A22BA}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.Build.0 = Debug|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.ActiveCfg = Release|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.Build.0 = Release|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.Build.0 = Debug|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.ActiveCfg = Release|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.Build.0 = Release|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.Build.0 = Debug|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.ActiveCfg = Release|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.Build.0 = Release|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.Build.0 = Debug|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.ActiveCfg = Release|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.Build.0 = Release|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.Build.0 = Debug|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.ActiveCfg = Release|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.Build.0 = Release|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.Build.0 = Debug|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.ActiveCfg = Release|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.Build.0 = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.Build.0 = Debug|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.ActiveCfg = Release|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vs2012/Arabica_noboost_tests.sln b/vs2012/Arabica_noboost_tests.sln
deleted file mode 100644
index 45db68f7..00000000
--- a/vs2012/Arabica_noboost_tests.sln
+++ /dev/null
@@ -1,102 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM", "test_DOM.vcproj", "{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-		{FB5B88E9-DAB3-401C-B413-77403C562C49} = {FB5B88E9-DAB3-401C-B413-77403C562C49}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_silly", "test_DOM_silly.vcproj", "{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-		{FB5B88E9-DAB3-401C-B413-77403C562C49} = {FB5B88E9-DAB3-401C-B413-77403C562C49}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_wide", "test_DOM_wide.vcproj", "{DE6FD811-12BD-4914-BA29-CD987C4B0D48}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C} = {7D957E35-93D3-4C9E-A5EF-4B0620CE758C}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-		{FB5B88E9-DAB3-401C-B413-77403C562C49} = {FB5B88E9-DAB3-401C-B413-77403C562C49}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_utils", "test_utils.vcproj", "{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter", "test_SAX_filter.vcproj", "{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_silly", "test_SAX_filter_silly.vcproj", "{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_wide", "test_SAX_filter_wide.vcproj", "{FB5B88E9-DAB3-401C-B413-77403C562C49}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica_noboost.vcproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.Build.0 = Debug|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.ActiveCfg = Release|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.Build.0 = Release|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.Build.0 = Debug|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.ActiveCfg = Release|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.Build.0 = Release|Win32
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|Win32.ActiveCfg = Debug|Win32
-		{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
-		{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
-		{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
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vs2012/Arabica_tests.sln b/vs2012/Arabica_tests.sln
deleted file mode 100644
index 03ccf127..00000000
--- a/vs2012/Arabica_tests.sln
+++ /dev/null
@@ -1,103 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2012 for Windows Desktop
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica.vcxproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM", "test_DOM.vcxproj", "{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnitLib", "CppUnitLib.vcxproj", "{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_silly", "test_DOM_silly.vcxproj", "{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}"
-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
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xslt_wide", "test_xslt_wide.vcxproj", "{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xslt_silly", "test_xslt_silly.vcxproj", "{9FBD30C4-8588-49A8-95E4-471307B57F7E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.Build.0 = Debug|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.ActiveCfg = Release|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.Build.0 = Release|Win32
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|Win32.Build.0 = Debug|Win32
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|Win32.ActiveCfg = Release|Win32
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|Win32.Build.0 = Release|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.Build.0 = Debug|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.ActiveCfg = Release|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.Build.0 = Release|Win32
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|Win32.ActiveCfg = Debug|Win32
-		{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
-		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Debug|Win32.Build.0 = Debug|Win32
-		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Release|Win32.ActiveCfg = Release|Win32
-		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Release|Win32.Build.0 = Release|Win32
-		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Debug|Win32.Build.0 = Debug|Win32
-		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Release|Win32.ActiveCfg = Release|Win32
-		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vs2012/CppUnitLib.vcxproj b/vs2012/CppUnitLib.vcxproj
deleted file mode 100644
index 5abd4959..00000000
--- a/vs2012/CppUnitLib.vcxproj
+++ /dev/null
@@ -1,108 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}</ProjectGuid>
-    <RootNamespace>CppUnitLib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_CppUnit\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_CppUnit\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CppUnit-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CppUnit</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>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(TargetName).lib  </OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\CppUnit\textui\TableTestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestCase.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestFailure.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\TestRunner.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestSuite.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TextTestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\XmlTestResult.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\CppUnit\TestRunner.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\CppUnitException.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\estring.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\Guards.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TableTestResult.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\Test.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCaller.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCase.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestFailure.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestSuite.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TextTestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\XmlTestResult.hpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/example_DOM_writer.vcxproj b/vs2012/example_DOM_writer.vcxproj
deleted file mode 100644
index 327600bb..00000000
--- a/vs2012/example_DOM_writer.vcxproj
+++ /dev/null
@@ -1,126 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C1CF7801-1681-4F15-8D71-BBC814805AF2}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_examples_DOM_writer\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_examples_DOM_writer\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>DOMWriter</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>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Dom\DOMWriter.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/example_SAX_Taggle.vcxproj b/vs2012/example_SAX_Taggle.vcxproj
deleted file mode 100644
index 9205530b..00000000
--- a/vs2012/example_SAX_Taggle.vcxproj
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{274EB942-0AA8-4715-8419-4722868A22BA}</ProjectGuid>
-    <RootNamespace>example_SAX_Taggle</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_example_SAX_taggle\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_example_SAX_taggle\</IntDir>
-    <TargetName>taggle</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>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>.\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Taggle\taggle.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="example_SAX_pyx.vcxproj">
-      <Project>{5214a867-2768-4cd0-9e29-6eed20718556}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="example_SAX_simplehander.vcxproj">
-      <Project>{4d861155-0183-4637-8f01-4f8fdb43c344}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/example_SAX_pyx.vcxproj b/vs2012/example_SAX_pyx.vcxproj
deleted file mode 100644
index 36fe2f4e..00000000
--- a/vs2012/example_SAX_pyx.vcxproj
+++ /dev/null
@@ -1,137 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5214A867-2768-4CD0-9E29-6EED20718556}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_examples_SAX_pyx\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_examples_SAX_pyx\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>pyx</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>
-      <AdditionalOptions>/Zm200
- %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Debug_examples_SAX_pyx/pyx.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Release_examples_SAX_pyx/pyx.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release_examples_SAX_pyx/</AssemblerListingLocation>
-      <ObjectFileName>.\Release_examples_SAX_pyx/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release_examples_SAX_pyx/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Sax\pyx.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/example_SAX_simplehander.vcxproj b/vs2012/example_SAX_simplehander.vcxproj
deleted file mode 100644
index cec0a1bc..00000000
--- a/vs2012/example_SAX_simplehander.vcxproj
+++ /dev/null
@@ -1,141 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>example_SAX_SimpleHandler</ProjectName>
-    <ProjectGuid>{4D861155-0183-4637-8F01-4F8FDB43C344}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_examples_SAX_simple\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_examples_SAX_simple\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>simplehandler</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>
-      <AdditionalOptions>/Zm200
- %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Release/SimpleHandler.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
-      <ObjectFileName>.\Release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Sax\SimpleHandler.cpp" />
-    <ClCompile Include="..\examples\Sax\wrapper.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\examples\Sax\SimpleHandler.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/example_SAX_writer.vcxproj b/vs2012/example_SAX_writer.vcxproj
deleted file mode 100644
index 7c387320..00000000
--- a/vs2012/example_SAX_writer.vcxproj
+++ /dev/null
@@ -1,136 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_examples_SAX_writer\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_examples_SAX_writer\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>Writer</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>
-      <AdditionalOptions>/Zm200
- %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Debug/Writer.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Release/Writer.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
-      <ObjectFileName>.\Release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Sax\writer.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/example_SAX_xmlbase.vcxproj b/vs2012/example_SAX_xmlbase.vcxproj
deleted file mode 100644
index fa746e43..00000000
--- a/vs2012/example_SAX_xmlbase.vcxproj
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_examples_SAX_xmlbase\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_examples_SAX_xmlbase\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>xmlbase</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>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Sax\xmlbase.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/example_Utils_transcode.vcxproj b/vs2012/example_Utils_transcode.vcxproj
deleted file mode 100644
index dc4a0c68..00000000
--- a/vs2012/example_Utils_transcode.vcxproj
+++ /dev/null
@@ -1,123 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{436B423B-BF20-4B2E-A187-604AF391FBE2}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_example_Utils_transcode\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_example_Utils_transcode\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>transcode</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>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Utils\transcode.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/example_XPath_xgrep.vcxproj b/vs2012/example_XPath_xgrep.vcxproj
deleted file mode 100644
index 61d61ab1..00000000
--- a/vs2012/example_XPath_xgrep.vcxproj
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5F7B038E-5148-4EF4-AB43-5035F666D00D}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_example_xpath_xgrep\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_example_xpath_xgrep\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>xgrep</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>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\XPath\xgrep.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="example_DOM_writer.vcxproj">
-      <Project>{c1cf7801-1681-4f15-8d71-bbc814805af2}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/example_XSLT_Mangle.vcxproj b/vs2012/example_XSLT_Mangle.vcxproj
deleted file mode 100644
index 3bd6e367..00000000
--- a/vs2012/example_XSLT_Mangle.vcxproj
+++ /dev/null
@@ -1,190 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{FDF423F0-ACF8-4963-81A4-C886B9174B72}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug_example_XSLT_mangle\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release_example_XSLT_mangle\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>mangle</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>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Xslt\mangle.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\Xslt\XSLT.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_apply_imports.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_apply_templates.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_attribute.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_call_template.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_choose.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_comment.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_compilation_context.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_compiled_stylesheet.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_copy.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_element.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_execution_context.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_for_each.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_functions.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_if.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_inline_element.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_item.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_key.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_message.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_namespace_stack.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_output.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_param.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_precedence.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_processing_instruction.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_qname.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_sink.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_sort.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_stylesheet.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_stylesheet_compiler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_template.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_text.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_top_level_param.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_value_of.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_variable.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_variable_impl.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_variable_stack.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_with_param.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_apply_imports_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_apply_templates_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_attribute_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_call_template_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_choose_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_comment_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_copy_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_create_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_element_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_for_each_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_if_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_include_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_inline_element_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_item_container_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_key_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_message_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_namespace_alias_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_output_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_processing_instruction_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_sort_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_template_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_text_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_value_of_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_value_validation.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_variable_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_with_param_handler.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\tests\XSLT\TO-DO" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/lib_arabica.vcxproj b/vs2012/lib_arabica.vcxproj
deleted file mode 100644
index 9c151d4e..00000000
--- a/vs2012/lib_arabica.vcxproj
+++ /dev/null
@@ -1,387 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>ArabicaLib</ProjectName>
-    <ProjectGuid>{4CA72415-D03A-4447-BE4E-C093A5146CAC}</ProjectGuid>
-    <RootNamespace>ArabicaLib</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_Arabica\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_Arabica\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Arabica-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Arabica</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>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
-      <ObjectFileName>.\Debug/</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(TargetName).lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Release/SAX.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
-      <ObjectFileName>.\Release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(TargetName).lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\Sax\AttributeList.hpp" />
-    <ClInclude Include="..\include\Sax\Attributes.hpp" />
-    <ClInclude Include="..\include\Sax\ContentHandler.hpp" />
-    <ClInclude Include="..\include\Sax\DocumentHandler.hpp" />
-    <ClInclude Include="..\include\Sax\DTDHandler.hpp" />
-    <ClInclude Include="..\include\Sax\EntityResolver.hpp" />
-    <ClInclude Include="..\include\Sax\ErrorHandler.hpp" />
-    <ClInclude Include="..\include\Sax\HandlerBase.hpp" />
-    <ClInclude Include="..\include\Sax\InputSource.hpp" />
-    <ClInclude Include="..\include\Sax\IStreamHandle.hpp" />
-    <ClInclude Include="..\include\Sax\Locator.hpp" />
-    <ClInclude Include="..\include\Sax\Parser.hpp" />
-    <ClInclude Include="..\include\Sax\ParserConfig.hpp" />
-    <ClInclude Include="..\include\Sax\SAXException.hpp" />
-    <ClInclude Include="..\include\Sax\saxfwd.hpp" />
-    <ClInclude Include="..\include\Sax\SAXNotRecognizedException.hpp" />
-    <ClInclude Include="..\include\Sax\SAXNotSupportedException.hpp" />
-    <ClInclude Include="..\include\Sax\SAXParseException.hpp" />
-    <ClInclude Include="..\include\Sax\XMLFilter.hpp" />
-    <ClInclude Include="..\include\Sax\XMLReader.hpp" />
-    <ClInclude Include="..\include\Sax\ext\Attributes2.hpp" />
-    <ClInclude Include="..\include\Sax\ext\DeclHandler.hpp" />
-    <ClInclude Include="..\include\Sax\ext\DefaultHandler2.hpp" />
-    <ClInclude Include="..\include\Sax\ext\LexicalHandler.hpp" />
-    <ClInclude Include="..\include\Sax\ext\Locator2.hpp" />
-    <ClInclude Include="..\include\Sax\ext\ProgressiveParser.hpp" />
-    <ClInclude Include="..\include\Sax\filter\NamespaceTracker.hpp" />
-    <ClInclude Include="..\include\Sax\filter\TextCoalescer.hpp" />
-    <ClInclude Include="..\include\Sax\filter\TextOnly.hpp" />
-    <ClInclude Include="..\include\Sax\filter\Writer.hpp" />
-    <ClInclude Include="..\include\Sax\filter\XMLBaseTracker.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\AttributeDefaults.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\AttributeListImpl.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\AttributesImpl.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\AttributeTypes.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\CatchErrorHandler.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\DefaultHandler.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\FeatureNames.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\InputSourceResolver.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\LocatorImpl.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\NamespaceSupport.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\XMLBaseSupport.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\XMLFilterImpl.hpp" />
-    <ClInclude Include="..\include\Sax\parsers\saxgarden.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\saxexpat.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\saxlibxml2.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\saxmsxml2.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\saxxerces.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\XercesFeatureNames.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\XercesPropertyNames.hpp" />
-    <ClInclude Include="..\include\Dom\Attr.hpp" />
-    <ClInclude Include="..\include\Dom\CDATASection.hpp" />
-    <ClInclude Include="..\include\Dom\CharacterData.hpp" />
-    <ClInclude Include="..\include\Dom\Comment.hpp" />
-    <ClInclude Include="..\include\Dom\Document.hpp" />
-    <ClInclude Include="..\include\Dom\DocumentFragment.hpp" />
-    <ClInclude Include="..\include\Dom\DocumentType.hpp" />
-    <ClInclude Include="..\include\Dom\DOMException.hpp" />
-    <ClInclude Include="..\include\Dom\DOMImplementation.hpp" />
-    <ClInclude Include="..\include\Dom\Element.hpp" />
-    <ClInclude Include="..\include\Dom\Entity.hpp" />
-    <ClInclude Include="..\include\Dom\EntityReference.hpp" />
-    <ClInclude Include="..\include\Dom\NamedNodeMap.hpp" />
-    <ClInclude Include="..\include\Dom\Node.hpp" />
-    <ClInclude Include="..\include\Dom\NodeList.hpp" />
-    <ClInclude Include="..\include\Dom\Notation.hpp" />
-    <ClInclude Include="..\include\Dom\ProcessingInstruction.hpp" />
-    <ClInclude Include="..\include\Dom\Proxy.hpp" />
-    <ClInclude Include="..\include\Dom\Text.hpp" />
-    <ClInclude Include="..\include\Dom\DualMode\DualMode.hpp" />
-    <ClInclude Include="..\include\Dom\Events\DocumentEvent.hpp" />
-    <ClInclude Include="..\include\Dom\Events\Event.hpp" />
-    <ClInclude Include="..\include\Dom\Events\EventException.hpp" />
-    <ClInclude Include="..\include\Dom\Events\EventListener.hpp" />
-    <ClInclude Include="..\include\Dom\Events\EventTarget.hpp" />
-    <ClInclude Include="..\include\Dom\Events\MutationEvent.hpp" />
-    <ClInclude Include="..\include\Dom\Sax2dom\DocumentTypeImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Sax2dom\SAX2DOM.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\AttrImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\AttrMap.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\AttrNSImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\CDATASectionImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\CharacterDataImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\CommentImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\DocumentFragmentImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\DocumentImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\DocumentTypeImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\DOMImplementation.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\ElementByTagImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\ElementImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\ElementNSImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\EntityImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\EntityReferenceImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\Helpers.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\NamedNodeMapImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\NodeImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\NotationImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\ProcessingInstructionImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\TextImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\DocumentTraversal.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\DocumentTraversalImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\NodeFilter.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\NodeIterator.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\TraversalImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\TreeWalker.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\TreeWalkerImpl.hpp" />
-    <ClInclude Include="..\include\Dom\io\Stream.hpp" />
-    <ClInclude Include="..\include\XPath\XPath.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_arithmetic.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_ast.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_ast_ids.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_axis_enumerator.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_compile_context.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_execution_context.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_expression.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_expression_impl.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_function.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_function_holder.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_function_resolver.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_grammar.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_logical.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_match.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_match_rewrite.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_namespace_context.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_namespace_node.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_node_test.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_object.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_parser.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_relational.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_resolver_holder.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_step.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_union.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_value.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_variable.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_variable_resolver.hpp" />
-    <ClInclude Include="..\include\Arabica\getparam.hpp" />
-    <ClInclude Include="..\include\Arabica\StringAdaptor.hpp" />
-    <ClInclude Include="..\include\Arabica\stringadaptortag.hpp" />
-    <ClInclude Include="..\include\Arabica\impl\VS6Workaround.hpp" />
-    <ClInclude Include="..\include\Xml\escaper.hpp" />
-    <ClInclude Include="..\include\XML\QName.hpp" />
-    <ClInclude Include="..\include\XML\strings.hpp" />
-    <ClInclude Include="..\include\Xml\XMLCharacterClasses.hpp" />
-    <ClInclude Include="..\include\io\convert_adaptor.hpp" />
-    <ClInclude Include="..\include\io\convertstream.hpp" />
-    <ClInclude Include="..\include\io\socket_stream.hpp" />
-    <ClInclude Include="..\include\io\uri.hpp" />
-    <ClInclude Include="..\include\convert\base64codecvt.hpp" />
-    <ClInclude Include="..\include\convert\impl\codecvt_specialisations.hpp" />
-    <ClInclude Include="..\include\convert\impl\iso88591_utf8.hpp" />
-    <ClInclude Include="..\include\convert\iso88591utf8codecvt.hpp" />
-    <ClInclude Include="..\include\convert\rot13codecvt.hpp" />
-    <ClInclude Include="..\include\convert\impl\ucs2_utf16.hpp" />
-    <ClInclude Include="..\include\convert\impl\ucs2_utf8.hpp" />
-    <ClInclude Include="..\include\convert\ucs2utf8codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf16beucs2codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf16leucs2codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf16utf8codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf8iso88591codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf8ucs2codecvt.hpp" />
-    <ClInclude Include="..\include\text\normalize_whitespace.hpp" />
-    <ClInclude Include="..\include\text\UnicodeCharacters.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\Element.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\ElementType.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\html\HTMLModels.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\html\HTMLScanner.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\html\HTMLSchema.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\Parser.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\ScanHandler.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\Scanner.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\Schema.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\SchemaImpl.hpp" />
-    <ClInclude Include="..\include\Taggle\Taggle.hpp" />
-    <ClInclude Include="..\include\XSLT\XSLT.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_apply_imports.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_apply_templates.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_attribute.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_call_template.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_choose.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_comment.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_compilation_context.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_compiled_stylesheet.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_copy.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_element.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_execution_context.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_for_each.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_functions.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_if.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_inline_element.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_item.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_key.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_message.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_namespace_stack.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_output.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_param.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_precedence.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_processing_instruction.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_qname.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_sink.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_sort.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_stylesheet.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_stylesheet_compiler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_stylesheet_parser.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_template.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_text.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_top_level_param.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_value_of.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_variable.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_variable_impl.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_variable_stack.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_with_param.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_apply_imports_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_apply_templates_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_attribute_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_call_template_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_choose_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_comment_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_constants.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_copy_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_create_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_element_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_for_each_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_if_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_include_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_inline_element_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_item_container_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_key_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_message_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_namespace_alias_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_output_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_processing_instruction_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_sort_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_strip_space_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_template_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_text_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_value_of_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_value_validation.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_variable_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_with_param_handler.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\arabica.cpp" />
-    <ClCompile Include="..\src\XML\XMLCharacterClasses.cpp" />
-    <ClCompile Include="..\src\SAX\helpers\InputSourceResolver.cpp" />
-    <ClCompile Include="..\src\io\uri.cpp" />
-    <ClCompile Include="..\src\convert\base64codecvt.cpp" />
-    <ClCompile Include="..\src\convert\impl\iso88591_utf8.cpp" />
-    <ClCompile Include="..\src\convert\iso88591utf8codecvt.cpp" />
-    <ClCompile Include="..\src\convert\rot13codecvt.cpp" />
-    <ClCompile Include="..\src\convert\impl\ucs2_utf16.cpp" />
-    <ClCompile Include="..\src\convert\impl\ucs2_utf8.cpp" />
-    <ClCompile Include="..\src\convert\ucs2utf8codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf16beucs2codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf16leucs2codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf16utf8codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf8iso88591codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf8ucs2codecvt.cpp" />
-    <ClCompile Include="..\src\taggle\Schema.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\vs7\ArabicaConfig.S">
-      <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
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\SAX\ArabicaConfig.hpp;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2012/test_DOM.vcxproj b/vs2012/test_DOM.vcxproj
deleted file mode 100644
index 2ad7e11f..00000000
--- a/vs2012/test_DOM.vcxproj
+++ /dev/null
@@ -1,153 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_DOM\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_DOM\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>DOM_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>
-      <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Debug_test_DOM/DOM_test.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Release_test_DOM/DOM_test.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release_test_DOM/</AssemblerListingLocation>
-      <ObjectFileName>.\Release_test_DOM/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release_test_DOM/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\DOM\main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\DOM\dom_conf_test.hpp" />
-    <ClInclude Include="..\tests\DOM\dom_test_suite.hpp" />
-    <ClInclude Include="..\tests\DOM\test_Attribute.hpp" />
-    <ClInclude Include="..\tests\DOM\test_CDATA.hpp" />
-    <ClInclude Include="..\tests\DOM\test_CharacterData.hpp" />
-    <ClInclude Include="..\tests\DOM\test_Document.hpp" />
-    <ClInclude Include="..\tests\DOM\test_DocumentFragment.hpp" />
-    <ClInclude Include="..\tests\DOM\test_DocumentType.hpp" />
-    <ClInclude Include="..\tests\DOM\test_DOMImplementation.hpp" />
-    <ClInclude Include="..\tests\DOM\test_Element.hpp" />
-    <ClInclude Include="..\tests\DOM\test_NamedNodeMap.hpp" />
-    <ClInclude Include="..\tests\DOM\test_ProcessingInstruction.hpp" />
-    <ClInclude Include="..\tests\Dom\test_SAX2DOM.hpp" />
-    <ClInclude Include="..\tests\DOM\test_Siblings.hpp" />
-    <ClInclude Include="..\tests\DOM\test_Text.hpp" />
-    <ClInclude Include="..\tests\DOM\test_TreeWalker.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/test_DOM_silly.vcxproj b/vs2012/test_DOM_silly.vcxproj
deleted file mode 100644
index fdb4f270..00000000
--- a/vs2012/test_DOM_silly.vcxproj
+++ /dev/null
@@ -1,160 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_DOM_silly\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_DOM_silly\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>DOM_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>
-      <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Debug_test_DOM/SAX2DOM_test.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Release_test_DOM/DOM_test.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release_test_DOM/</AssemblerListingLocation>
-      <ObjectFileName>.\Release_test_DOM/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release_test_DOM/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ProgramDatabaseFile>.\Release_test_DOM/$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\DOM\main_silly.cpp" />
-    <ClCompile Include="..\tests\silly_string\silly_string.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Dom\dom_test_suite.hpp" />
-    <ClInclude Include="..\tests\silly_string\silly_string.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Attribute.hpp" />
-    <ClInclude Include="..\tests\Dom\test_CDATA.hpp" />
-    <ClInclude Include="..\tests\Dom\test_CharacterData.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Document.hpp" />
-    <ClInclude Include="..\tests\Dom\test_DocumentFragment.hpp" />
-    <ClInclude Include="..\tests\Dom\test_DocumentType.hpp" />
-    <ClInclude Include="..\tests\Dom\test_DOMImplementation.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Element.hpp" />
-    <ClInclude Include="..\tests\Dom\test_ProcessingInstruction.hpp" />
-    <ClInclude Include="..\tests\Dom\test_SAX2DOM.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Siblings.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Text.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_utils.vcxproj">
-      <Project>{fa1a13a0-07d3-4fc9-a2d2-9f5fa8c3c3a4}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/test_DOM_wide.vcxproj b/vs2012/test_DOM_wide.vcxproj
deleted file mode 100644
index 60ad630f..00000000
--- a/vs2012/test_DOM_wide.vcxproj
+++ /dev/null
@@ -1,162 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DE6FD811-12BD-4914-BA29-CD987C4B0D48}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_DOM\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_DOM_wide\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName>DOM_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>
-      <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Debug_test_DOM/SAX2DOM_test.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Release_test_DOM/DOM_test.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release_test_DOM/</AssemblerListingLocation>
-      <ObjectFileName>.\Release_test_DOM/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release_test_DOM/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\DOM\main_wide.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\DOM\dom_test_suite.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Attribute.hpp" />
-    <ClInclude Include="..\tests\Dom\test_CDATA.hpp" />
-    <ClInclude Include="..\tests\Dom\test_CharacterData.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Document.hpp" />
-    <ClInclude Include="..\tests\Dom\test_DocumentFragment.hpp" />
-    <ClInclude Include="..\tests\Dom\test_DocumentType.hpp" />
-    <ClInclude Include="..\tests\Dom\test_DOMImplementation.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Element.hpp" />
-    <ClInclude Include="..\tests\Dom\test_ProcessingInstruction.hpp" />
-    <ClInclude Include="..\tests\Dom\test_SAX2DOM.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Siblings.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Text.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM_silly.vcxproj">
-      <Project>{7d957e35-93d3-4c9e-a5ef-4b0620ce758c}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_utils.vcxproj">
-      <Project>{fa1a13a0-07d3-4fc9-a2d2-9f5fa8c3c3a4}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/test_SAX_filter.vcxproj b/vs2012/test_SAX_filter.vcxproj
deleted file mode 100644
index bcf1c098..00000000
--- a/vs2012/test_SAX_filter.vcxproj
+++ /dev/null
@@ -1,144 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_SAXFilter\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\</OutDir>
-    <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>
-      <AdditionalOptions>/Zm200
- %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Debug/Writer.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Release/Writer.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\Sax\filter_test.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Sax\test_WhitespaceStripper.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_utils.vcxproj">
-      <Project>{fa1a13a0-07d3-4fc9-a2d2-9f5fa8c3c3a4}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/test_SAX_filter_silly.vcxproj b/vs2012/test_SAX_filter_silly.vcxproj
deleted file mode 100644
index 89d9e126..00000000
--- a/vs2012/test_SAX_filter_silly.vcxproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_SAXFilter_silly\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\</OutDir>
-    <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>
-      <AdditionalOptions>/Zm200
- %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\Sax\filter_test_silly.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Sax\test_WhitespaceStripper.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/test_SAX_filter_wide.vcxproj b/vs2012/test_SAX_filter_wide.vcxproj
deleted file mode 100644
index 80c8cabc..00000000
--- a/vs2012/test_SAX_filter_wide.vcxproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{FB5B88E9-DAB3-401C-B413-77403C562C49}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_SAXFilter_wide\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\</OutDir>
-    <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>
-      <AdditionalOptions>/Zm200
- %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\Sax\filter_test_wide.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Sax\test_WhitespaceStripper.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/test_utils.vcxproj b/vs2012/test_utils.vcxproj
deleted file mode 100644
index 568de2da..00000000
--- a/vs2012/test_utils.vcxproj
+++ /dev/null
@@ -1,133 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_utils\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <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>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>true</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\Utils\utils_test.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Utils\test_base64.hpp" />
-    <ClInclude Include="..\tests\Utils\test_normalize_whitespace.hpp" />
-    <ClInclude Include="..\tests\Utils\test_qname.hpp" />
-    <ClInclude Include="..\tests\Utils\test_uri.hpp" />
-    <ClInclude Include="..\tests\Utils\test_xml_strings.hpp" />
-    <ClInclude Include="..\tests\Utils\util_test_suite.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/test_xpath.vcxproj b/vs2012/test_xpath.vcxproj
deleted file mode 100644
index 3316e0f8..00000000
--- a/vs2012/test_xpath.vcxproj
+++ /dev/null
@@ -1,146 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_xpath\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_xpath\</IntDir>
-    <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>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\XPath\main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\XPath\arithmetic_test.hpp" />
-    <ClInclude Include="..\tests\XPath\attr_value_test.hpp" />
-    <ClInclude Include="..\tests\XPath\axis_enumerator_test.hpp" />
-    <ClInclude Include="..\tests\XPath\execute_test.hpp" />
-    <ClInclude Include="..\tests\XPath\expression_test.hpp" />
-    <ClInclude Include="..\tests\XPath\logical_test.hpp" />
-    <ClInclude Include="..\tests\XPath\match_test.hpp" />
-    <ClInclude Include="..\tests\XPath\node_test_test.hpp" />
-    <ClInclude Include="..\tests\XPath\parse_test.hpp" />
-    <ClInclude Include="..\tests\XPath\relational_test.hpp" />
-    <ClInclude Include="..\tests\XPath\step_test.hpp" />
-    <ClInclude Include="..\tests\XPath\text_node_test.hpp" />
-    <ClInclude Include="..\tests\XPath\value_test.hpp" />
-    <ClInclude Include="..\tests\XPath\xpath_test_suite.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/test_xpath_silly.vcxproj b/vs2012/test_xpath_silly.vcxproj
deleted file mode 100644
index d64f659b..00000000
--- a/vs2012/test_xpath_silly.vcxproj
+++ /dev/null
@@ -1,150 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{92BC362C-4B23-4444-A9A8-81933D01D283}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_xpath_silly\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <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>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\XPath\main_silly.cpp" />
-    <ClCompile Include="..\tests\silly_string\silly_string.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\XPath\arithmetic_test.hpp" />
-    <ClInclude Include="..\tests\XPath\attr_value_test.hpp" />
-    <ClInclude Include="..\tests\XPath\axis_enumerator_test.hpp" />
-    <ClInclude Include="..\tests\XPath\execute_test.hpp" />
-    <ClInclude Include="..\tests\XPath\expression_test.hpp" />
-    <ClInclude Include="..\tests\XPath\logical_test.hpp" />
-    <ClInclude Include="..\tests\XPath\match_test.hpp" />
-    <ClInclude Include="..\tests\XPath\node_test_test.hpp" />
-    <ClInclude Include="..\tests\XPath\parse_test.hpp" />
-    <ClInclude Include="..\tests\XPath\relational_test.hpp" />
-    <ClInclude Include="..\tests\silly_string\silly_string.hpp" />
-    <ClInclude Include="..\tests\XPath\step_test.hpp" />
-    <ClInclude Include="..\tests\XPath\value_test.hpp" />
-    <ClInclude Include="..\tests\XPath\xpath_test_suite.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_xpath.vcxproj">
-      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/test_xpath_wide.vcxproj b/vs2012/test_xpath_wide.vcxproj
deleted file mode 100644
index 005f4ebf..00000000
--- a/vs2012/test_xpath_wide.vcxproj
+++ /dev/null
@@ -1,148 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_xpath_wide\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <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>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\XPath\main_wide.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\XPath\arithmetic_test.hpp" />
-    <ClInclude Include="..\tests\XPath\attr_value_test.hpp" />
-    <ClInclude Include="..\tests\XPath\axis_enumerator_test.hpp" />
-    <ClInclude Include="..\tests\XPath\execute_test.hpp" />
-    <ClInclude Include="..\tests\XPath\expression_test.hpp" />
-    <ClInclude Include="..\tests\XPath\logical_test.hpp" />
-    <ClInclude Include="..\tests\XPath\match_test.hpp" />
-    <ClInclude Include="..\tests\XPath\node_test_test.hpp" />
-    <ClInclude Include="..\tests\XPath\parse_test.hpp" />
-    <ClInclude Include="..\tests\XPath\relational_test.hpp" />
-    <ClInclude Include="..\tests\XPath\step_test.hpp" />
-    <ClInclude Include="..\tests\XPath\value_test.hpp" />
-    <ClInclude Include="..\tests\XPath\xpath_test_suite.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_xpath.vcxproj">
-      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/test_xslt.vcxproj b/vs2012/test_xslt.vcxproj
deleted file mode 100644
index 251f676f..00000000
--- a/vs2012/test_xslt.vcxproj
+++ /dev/null
@@ -1,144 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{44BA3424-C58E-4A49-ADDD-6180C61E5E34}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_xslt\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_xslt\</IntDir>
-    <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>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>NotSet</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>
-      </OptimizeReferences>
-      <EnableCOMDATFolding>
-      </EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>NotSet</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\Xslt\main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Xslt\xslt_test.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\tests\XSLT\testsuite\TESTS\arabica-catalog.xml" />
-    <None Include="..\tests\Xslt\testsuite\Tests\arabica-expected-fails.xml" />
-    <None Include="..\tests\Xslt\testsuite\Tests\catalog.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_xpath.vcxproj">
-      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/test_xslt_silly.vcxproj b/vs2012/test_xslt_silly.vcxproj
deleted file mode 100644
index 79ace3e7..00000000
--- a/vs2012/test_xslt_silly.vcxproj
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9FBD30C4-8588-49A8-95E4-471307B57F7E}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_xslt_silly\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_xslt_silly\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">xslt_test_silly</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">xslt_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>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>NotSet</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>
-      </OptimizeReferences>
-      <EnableCOMDATFolding>
-      </EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>NotSet</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\silly_string\silly_string.cpp" />
-    <ClCompile Include="..\tests\Xslt\main_silly.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Xslt\xslt_test.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\tests\XSLT\testsuite\TESTS\arabica-catalog.xml" />
-    <None Include="..\tests\Xslt\testsuite\Tests\arabica-expected-fails.xml" />
-    <None Include="..\tests\Xslt\testsuite\Tests\catalog.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_xpath.vcxproj">
-      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2012/test_xslt_wide.vcxproj b/vs2012/test_xslt_wide.vcxproj
deleted file mode 100644
index 4743e40d..00000000
--- a/vs2012/test_xslt_wide.vcxproj
+++ /dev/null
@@ -1,144 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_xslt_wide\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_xslt_wide\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">xslt_test_wide</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">xslt_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>
-      <AdditionalOptions>/Zm1000  /bigobj %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>NotSet</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>
-      </OptimizeReferences>
-      <EnableCOMDATFolding>
-      </EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>NotSet</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\Xslt\main_wide.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Xslt\xslt_test.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\tests\XSLT\testsuite\TESTS\arabica-catalog.xml" />
-    <None Include="..\tests\Xslt\testsuite\Tests\arabica-expected-fails.xml" />
-    <None Include="..\tests\Xslt\testsuite\Tests\catalog.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_xpath.vcxproj">
-      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2013+/Arabica.props b/vs2013+/Arabica.props
deleted file mode 100644
index 1e21ed38..00000000
--- a/vs2013+/Arabica.props
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <_PropertySheetDisplayName>yekneb</_PropertySheetDisplayName>
-    <LinkIncremental>false</LinkIncremental>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
-    <TargetPlatform Condition="'$(Platform)'=='Win32'">x86</TargetPlatform>
-    <TargetPlatform Condition="'$(Platform)'=='x64'">x64</TargetPlatform>
-    <VCSubDir Condition="'$(VisualStudioVersion)'=='12.0'">vc12</VCSubDir>
-    <VCSubDir Condition="'$(VisualStudioVersion)'=='14.0'">vc14</VCSubDir>
-    <VCSubDir Condition="'$(VisualStudioVersion)'=='15.0'">vc141</VCSubDir>
-    <VCSubDir Condition="'$(VisualStudioVersion)'=='16.0'">vc142</VCSubDir>
-    <OutDir>$([System.IO.Path]::GetFullPath('$(SolutionDir)..\$(VCSubDir)\$(TargetPlatform)\$(Configuration)\'))</OutDir>
-    <IntDir>$(SolutionDir)int\$(VCSubDir)\$(TargetPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\include'));%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <BasicRuntimeChecks Condition="'$(Configuration)'=='Debug'">EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>      
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <DisableSpecificWarnings>4503;26439;26444;26451;26495;26812</DisableSpecificWarnings>
-      <EnablePREfast>true</EnablePREfast>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <FunctionLevelLinking Condition="'$(Configuration)'=='Release'">true</FunctionLevelLinking>
-      <InlineFunctionExpansion Condition="'$(Configuration)'=='Release'">OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization Condition="'$(Configuration)'=='Debug'">Disabled</Optimization>
-      <Optimization Condition="'$(Configuration)'=='Release'">MaxSpeed</Optimization>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug'">_DEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release'">NDEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName Condition="'$(ConfigurationType)'=='StaticLibrary'">$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <RuntimeLibrary Condition="'$(Configuration)'=='Debug'">MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeLibrary Condition="'$(Configuration)'=='Release'">MultiThreadedDLL</RuntimeLibrary>      
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <SDLCheck>true</SDLCheck>
-      <StringPooling Condition="'$(Configuration)'=='Debug'">false</StringPooling>
-      <StringPooling Condition="'$(Configuration)'=='Release'">true</StringPooling>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <Lib>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <Link>
-      <DataExecutionPrevention></DataExecutionPrevention>
-      <EnableCOMDATFolding Condition="'$(Configuration)'=='Release'">true</EnableCOMDATFolding>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <OptimizeReferences Condition="'$(Configuration)'=='Release'">true</OptimizeReferences>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <TargetMachine Condition="'$(Platform)'=='Win32'">MachineX86</TargetMachine>
-      <TargetMachine Condition="'$(Platform)'=='x64'">MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\include'));%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug'">_DEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release'">NDEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-</Project>
diff --git a/vs2013+/Arabica.sln b/vs2013+/Arabica.sln
deleted file mode 100644
index 5c5695f2..00000000
--- a/vs2013+/Arabica.sln
+++ /dev/null
@@ -1,118 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29728.190
-MinimumVisualStudioVersion = 12.0.40629.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica.vcxproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_pyx", "example_SAX_pyx.vcxproj", "{5214A867-2768-4CD0-9E29-6EED20718556}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_SimpleHandler", "example_SAX_simplehander.vcxproj", "{4D861155-0183-4637-8F01-4F8FDB43C344}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_writer", "example_SAX_writer.vcxproj", "{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_xmlbase", "example_SAX_xmlbase.vcxproj", "{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_DOM_writer", "example_DOM_writer.vcxproj", "{C1CF7801-1681-4F15-8D71-BBC814805AF2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_Utils_transcode", "example_Utils_transcode.vcxproj", "{436B423B-BF20-4B2E-A187-604AF391FBE2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_XPath_xgrep", "example_XPath_xgrep.vcxproj", "{5F7B038E-5148-4EF4-AB43-5035F666D00D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_XSLT_Mangle", "example_XSLT_Mangle.vcxproj", "{FDF423F0-ACF8-4963-81A4-C886B9174B72}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_Taggle", "example_SAX_Taggle.vcxproj", "{274EB942-0AA8-4715-8419-4722868A22BA}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|x64.ActiveCfg = Debug|x64
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|x64.Build.0 = Debug|x64
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|x64.ActiveCfg = Release|x64
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|x64.Build.0 = Release|x64
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.Build.0 = Debug|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|x64.ActiveCfg = Debug|x64
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|x64.Build.0 = Debug|x64
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.ActiveCfg = Release|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.Build.0 = Release|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|x64.ActiveCfg = Release|x64
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|x64.Build.0 = Release|x64
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.Build.0 = Debug|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|x64.ActiveCfg = Debug|x64
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|x64.Build.0 = Debug|x64
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.ActiveCfg = Release|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.Build.0 = Release|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|x64.ActiveCfg = Release|x64
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|x64.Build.0 = Release|x64
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.Build.0 = Debug|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|x64.ActiveCfg = Debug|x64
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|x64.Build.0 = Debug|x64
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.ActiveCfg = Release|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.Build.0 = Release|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|x64.ActiveCfg = Release|x64
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|x64.Build.0 = Release|x64
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.Build.0 = Debug|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|x64.ActiveCfg = Debug|x64
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|x64.Build.0 = Debug|x64
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.ActiveCfg = Release|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.Build.0 = Release|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|x64.ActiveCfg = Release|x64
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|x64.Build.0 = Release|x64
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.Build.0 = Debug|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|x64.ActiveCfg = Debug|x64
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|x64.Build.0 = Debug|x64
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.ActiveCfg = Release|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.Build.0 = Release|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|x64.ActiveCfg = Release|x64
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|x64.Build.0 = Release|x64
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.Build.0 = Debug|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|x64.ActiveCfg = Debug|x64
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|x64.Build.0 = Debug|x64
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.ActiveCfg = Release|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.Build.0 = Release|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|x64.ActiveCfg = Release|x64
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|x64.Build.0 = Release|x64
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Debug|Win32.Build.0 = Debug|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Debug|x64.ActiveCfg = Debug|x64
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Debug|x64.Build.0 = Debug|x64
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Release|Win32.ActiveCfg = Release|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Release|Win32.Build.0 = Release|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Release|x64.ActiveCfg = Release|x64
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Release|x64.Build.0 = Release|x64
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Debug|Win32.Build.0 = Debug|Win32
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Debug|x64.ActiveCfg = Debug|x64
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Debug|x64.Build.0 = Debug|x64
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Release|Win32.ActiveCfg = Release|Win32
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Release|Win32.Build.0 = Release|Win32
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Release|x64.ActiveCfg = Release|x64
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Release|x64.Build.0 = Release|x64
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.Build.0 = Debug|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|x64.ActiveCfg = Debug|x64
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|x64.Build.0 = Debug|x64
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.ActiveCfg = Release|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.Build.0 = Release|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|x64.ActiveCfg = Release|x64
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vs2013+/Arabica_noboost.sln b/vs2013+/Arabica_noboost.sln
deleted file mode 100644
index 632b6dad..00000000
--- a/vs2013+/Arabica_noboost.sln
+++ /dev/null
@@ -1,98 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29728.190
-MinimumVisualStudioVersion = 12.0.40629.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_pyx", "example_SAX_pyx.vcxproj", "{5214A867-2768-4CD0-9E29-6EED20718556}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_SimpleHandler", "example_SAX_simplehander.vcxproj", "{4D861155-0183-4637-8F01-4F8FDB43C344}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_writer", "example_SAX_writer.vcxproj", "{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_xmlbase", "example_SAX_xmlbase.vcxproj", "{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_DOM_writer", "example_DOM_writer.vcxproj", "{C1CF7801-1681-4F15-8D71-BBC814805AF2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_Utils_transcode", "example_Utils_transcode.vcxproj", "{436B423B-BF20-4B2E-A187-604AF391FBE2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica_noboost.vcxproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_Taggle", "example_SAX_Taggle.vcxproj", "{274EB942-0AA8-4715-8419-4722868A22BA}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.Build.0 = Debug|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|x64.ActiveCfg = Debug|x64
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|x64.Build.0 = Debug|x64
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.ActiveCfg = Release|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.Build.0 = Release|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|x64.ActiveCfg = Release|x64
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|x64.Build.0 = Release|x64
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.Build.0 = Debug|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|x64.ActiveCfg = Debug|x64
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|x64.Build.0 = Debug|x64
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.ActiveCfg = Release|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.Build.0 = Release|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|x64.ActiveCfg = Release|x64
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|x64.Build.0 = Release|x64
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.Build.0 = Debug|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|x64.ActiveCfg = Debug|x64
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|x64.Build.0 = Debug|x64
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.ActiveCfg = Release|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.Build.0 = Release|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|x64.ActiveCfg = Release|x64
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|x64.Build.0 = Release|x64
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.Build.0 = Debug|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|x64.ActiveCfg = Debug|x64
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|x64.Build.0 = Debug|x64
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.ActiveCfg = Release|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.Build.0 = Release|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|x64.ActiveCfg = Release|x64
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|x64.Build.0 = Release|x64
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.Build.0 = Debug|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|x64.ActiveCfg = Debug|x64
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|x64.Build.0 = Debug|x64
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.ActiveCfg = Release|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.Build.0 = Release|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|x64.ActiveCfg = Release|x64
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|x64.Build.0 = Release|x64
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.Build.0 = Debug|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|x64.ActiveCfg = Debug|x64
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|x64.Build.0 = Debug|x64
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.ActiveCfg = Release|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.Build.0 = Release|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|x64.ActiveCfg = Release|x64
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|x64.Build.0 = Release|x64
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|x64.ActiveCfg = Debug|x64
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|x64.Build.0 = Debug|x64
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|x64.ActiveCfg = Release|x64
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|x64.Build.0 = Release|x64
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.Build.0 = Debug|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|x64.ActiveCfg = Debug|x64
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|x64.Build.0 = Debug|x64
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.ActiveCfg = Release|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.Build.0 = Release|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|x64.ActiveCfg = Release|x64
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vs2013+/Arabica_noboost_tests.sln b/vs2013+/Arabica_noboost_tests.sln
deleted file mode 100644
index 236033e5..00000000
--- a/vs2013+/Arabica_noboost_tests.sln
+++ /dev/null
@@ -1,149 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29728.190
-MinimumVisualStudioVersion = 12.0.40629.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM", "test_DOM.vcxproj", "{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-		{FB5B88E9-DAB3-401C-B413-77403C562C49} = {FB5B88E9-DAB3-401C-B413-77403C562C49}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_silly", "test_DOM_silly.vcxproj", "{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-		{FB5B88E9-DAB3-401C-B413-77403C562C49} = {FB5B88E9-DAB3-401C-B413-77403C562C49}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_wide", "test_DOM_wide.vcxproj", "{DE6FD811-12BD-4914-BA29-CD987C4B0D48}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C} = {7D957E35-93D3-4C9E-A5EF-4B0620CE758C}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-		{FB5B88E9-DAB3-401C-B413-77403C562C49} = {FB5B88E9-DAB3-401C-B413-77403C562C49}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_utils", "test_utils.vcxproj", "{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter", "test_SAX_filter.vcxproj", "{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_silly", "test_SAX_filter_silly.vcxproj", "{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_wide", "test_SAX_filter_wide.vcxproj", "{FB5B88E9-DAB3-401C-B413-77403C562C49}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica_noboost.vcxproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnitLib", "CppUnitLib.vcxproj", "{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.Build.0 = Debug|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|x64.ActiveCfg = Debug|x64
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|x64.Build.0 = Debug|x64
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.ActiveCfg = Release|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.Build.0 = Release|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|x64.ActiveCfg = Release|x64
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|x64.Build.0 = Release|x64
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.Build.0 = Debug|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|x64.ActiveCfg = Debug|x64
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|x64.Build.0 = Debug|x64
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.ActiveCfg = Release|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.Build.0 = Release|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|x64.ActiveCfg = Release|x64
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|x64.Build.0 = Release|x64
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|Win32.Build.0 = Debug|Win32
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|x64.ActiveCfg = Debug|x64
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|x64.Build.0 = Debug|x64
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release|Win32.ActiveCfg = Release|Win32
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release|Win32.Build.0 = Release|Win32
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release|x64.ActiveCfg = Release|x64
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release|x64.Build.0 = Release|x64
-		{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}.Debug|x64.ActiveCfg = Debug|x64
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Debug|x64.Build.0 = Debug|x64
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|Win32.ActiveCfg = Release|Win32
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|Win32.Build.0 = Release|Win32
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|x64.ActiveCfg = Release|x64
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|x64.Build.0 = Release|x64
-		{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}.Debug|x64.ActiveCfg = Debug|x64
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug|x64.Build.0 = Debug|x64
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|Win32.ActiveCfg = Release|Win32
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|Win32.Build.0 = Release|Win32
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|x64.ActiveCfg = Release|x64
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|x64.Build.0 = Release|x64
-		{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}.Debug|x64.ActiveCfg = Debug|x64
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Debug|x64.Build.0 = Debug|x64
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|Win32.ActiveCfg = Release|Win32
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|Win32.Build.0 = Release|Win32
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|x64.ActiveCfg = Release|x64
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|x64.Build.0 = Release|x64
-		{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}.Debug|x64.ActiveCfg = Debug|x64
-		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Debug|x64.Build.0 = Debug|x64
-		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|Win32.ActiveCfg = Release|Win32
-		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|Win32.Build.0 = Release|Win32
-		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|x64.ActiveCfg = Release|x64
-		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|x64.Build.0 = Release|x64
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|x64.ActiveCfg = Debug|x64
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|x64.Build.0 = Debug|x64
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|x64.ActiveCfg = Release|x64
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|x64.Build.0 = Release|x64
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|Win32.Build.0 = Debug|Win32
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|x64.ActiveCfg = Debug|x64
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|x64.Build.0 = Debug|x64
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|Win32.ActiveCfg = Release|Win32
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|Win32.Build.0 = Release|Win32
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|x64.ActiveCfg = Release|x64
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vs2013+/Arabica_tests.sln b/vs2013+/Arabica_tests.sln
deleted file mode 100644
index c1a2237e..00000000
--- a/vs2013+/Arabica_tests.sln
+++ /dev/null
@@ -1,168 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29728.190
-MinimumVisualStudioVersion = 12.0.40629.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica.vcxproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM", "test_DOM.vcxproj", "{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnitLib", "CppUnitLib.vcxproj", "{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_silly", "test_DOM_silly.vcxproj", "{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}"
-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
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xslt_wide", "test_xslt_wide.vcxproj", "{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xslt_silly", "test_xslt_silly.vcxproj", "{9FBD30C4-8588-49A8-95E4-471307B57F7E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|x64.ActiveCfg = Debug|x64
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|x64.Build.0 = Debug|x64
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|x64.ActiveCfg = Release|x64
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|x64.Build.0 = Release|x64
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.Build.0 = Debug|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|x64.ActiveCfg = Debug|x64
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|x64.Build.0 = Debug|x64
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.ActiveCfg = Release|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.Build.0 = Release|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|x64.ActiveCfg = Release|x64
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|x64.Build.0 = Release|x64
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|Win32.Build.0 = Debug|Win32
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|x64.ActiveCfg = Debug|x64
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|x64.Build.0 = Debug|x64
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|Win32.ActiveCfg = Release|Win32
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|Win32.Build.0 = Release|Win32
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|x64.ActiveCfg = Release|x64
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|x64.Build.0 = Release|x64
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.Build.0 = Debug|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|x64.ActiveCfg = Debug|x64
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|x64.Build.0 = Debug|x64
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.ActiveCfg = Release|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.Build.0 = Release|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|x64.ActiveCfg = Release|x64
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|x64.Build.0 = Release|x64
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|Win32.Build.0 = Debug|Win32
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|x64.ActiveCfg = Debug|x64
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|x64.Build.0 = Debug|x64
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release|Win32.ActiveCfg = Release|Win32
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release|Win32.Build.0 = Release|Win32
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release|x64.ActiveCfg = Release|x64
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release|x64.Build.0 = Release|x64
-		{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}.Debug|x64.ActiveCfg = Debug|x64
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug|x64.Build.0 = Debug|x64
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|Win32.ActiveCfg = Release|Win32
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|Win32.Build.0 = Release|Win32
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|x64.ActiveCfg = Release|x64
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|x64.Build.0 = Release|x64
-		{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}.Debug|x64.ActiveCfg = Debug|x64
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Debug|x64.Build.0 = Debug|x64
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|Win32.ActiveCfg = Release|Win32
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|Win32.Build.0 = Release|Win32
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|x64.ActiveCfg = Release|x64
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|x64.Build.0 = Release|x64
-		{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}.Debug|x64.ActiveCfg = Debug|x64
-		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Debug|x64.Build.0 = Debug|x64
-		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|Win32.ActiveCfg = Release|Win32
-		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|Win32.Build.0 = Release|Win32
-		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|x64.ActiveCfg = Release|x64
-		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|x64.Build.0 = Release|x64
-		{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}.Debug|x64.ActiveCfg = Debug|x64
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Debug|x64.Build.0 = Debug|x64
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|Win32.ActiveCfg = Release|Win32
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|Win32.Build.0 = Release|Win32
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|x64.ActiveCfg = Release|x64
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|x64.Build.0 = Release|x64
-		{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}.Debug|x64.ActiveCfg = Debug|x64
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Debug|x64.Build.0 = Debug|x64
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Release|Win32.ActiveCfg = Release|Win32
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Release|Win32.Build.0 = Release|Win32
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Release|x64.ActiveCfg = Release|x64
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Release|x64.Build.0 = Release|x64
-		{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}.Debug|x64.ActiveCfg = Debug|x64
-		{92BC362C-4B23-4444-A9A8-81933D01D283}.Debug|x64.Build.0 = Debug|x64
-		{92BC362C-4B23-4444-A9A8-81933D01D283}.Release|Win32.ActiveCfg = Release|Win32
-		{92BC362C-4B23-4444-A9A8-81933D01D283}.Release|Win32.Build.0 = Release|Win32
-		{92BC362C-4B23-4444-A9A8-81933D01D283}.Release|x64.ActiveCfg = Release|x64
-		{92BC362C-4B23-4444-A9A8-81933D01D283}.Release|x64.Build.0 = Release|x64
-		{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}.Debug|x64.ActiveCfg = Debug|x64
-		{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}.Debug|x64.Build.0 = Debug|x64
-		{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}.Release|Win32.ActiveCfg = Release|Win32
-		{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}.Release|Win32.Build.0 = Release|Win32
-		{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}.Release|x64.ActiveCfg = Release|x64
-		{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}.Release|x64.Build.0 = Release|x64
-		{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}.Debug|x64.ActiveCfg = Debug|x64
-		{44BA3424-C58E-4A49-ADDD-6180C61E5E34}.Debug|x64.Build.0 = Debug|x64
-		{44BA3424-C58E-4A49-ADDD-6180C61E5E34}.Release|Win32.ActiveCfg = Release|Win32
-		{44BA3424-C58E-4A49-ADDD-6180C61E5E34}.Release|Win32.Build.0 = Release|Win32
-		{44BA3424-C58E-4A49-ADDD-6180C61E5E34}.Release|x64.ActiveCfg = Release|x64
-		{44BA3424-C58E-4A49-ADDD-6180C61E5E34}.Release|x64.Build.0 = Release|x64
-		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Debug|Win32.Build.0 = Debug|Win32
-		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Debug|x64.ActiveCfg = Debug|x64
-		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Debug|x64.Build.0 = Debug|x64
-		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Release|Win32.ActiveCfg = Release|Win32
-		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Release|Win32.Build.0 = Release|Win32
-		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Release|x64.ActiveCfg = Release|x64
-		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Release|x64.Build.0 = Release|x64
-		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Debug|Win32.Build.0 = Debug|Win32
-		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Debug|x64.ActiveCfg = Debug|x64
-		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Debug|x64.Build.0 = Debug|x64
-		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Release|Win32.ActiveCfg = Release|Win32
-		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Release|Win32.Build.0 = Release|Win32
-		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Release|x64.ActiveCfg = Release|x64
-		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vs2013+/CppUnitLib.vcxproj b/vs2013+/CppUnitLib.vcxproj
deleted file mode 100644
index e8ba445f..00000000
--- a/vs2013+/CppUnitLib.vcxproj
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}</ProjectGuid>
-    <RootNamespace>CppUnitLib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>CppUnit</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\CppUnit\textui\TableTestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestCase.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestFailure.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\TestRunner.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestSuite.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TextTestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\XmlTestResult.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\CppUnit\TestRunner.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\CppUnitException.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\estring.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\Guards.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TableTestResult.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\Test.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCaller.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCase.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestFailure.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestSuite.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TextTestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\XmlTestResult.hpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/example_DOM_writer.vcxproj b/vs2013+/example_DOM_writer.vcxproj
deleted file mode 100644
index 5957dd86..00000000
--- a/vs2013+/example_DOM_writer.vcxproj
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C1CF7801-1681-4F15-8D71-BBC814805AF2}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>DOMWriter</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile />
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile />
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile />
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile />
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Dom\DOMWriter.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/example_SAX_Taggle.vcxproj b/vs2013+/example_SAX_Taggle.vcxproj
deleted file mode 100644
index 617b8f6d..00000000
--- a/vs2013+/example_SAX_Taggle.vcxproj
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{274EB942-0AA8-4715-8419-4722868A22BA}</ProjectGuid>
-    <RootNamespace>example_SAX_Taggle</RootNamespace>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>taggle</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile />
-    <Link />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile />
-    <Link />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile />
-    <Link />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile />
-    <Link />
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Taggle\taggle.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="example_SAX_pyx.vcxproj">
-      <Project>{5214a867-2768-4cd0-9e29-6eed20718556}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="example_SAX_simplehander.vcxproj">
-      <Project>{4d861155-0183-4637-8f01-4f8fdb43c344}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/example_SAX_pyx.vcxproj b/vs2013+/example_SAX_pyx.vcxproj
deleted file mode 100644
index 1dc5a7d5..00000000
--- a/vs2013+/example_SAX_pyx.vcxproj
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5214A867-2768-4CD0-9E29-6EED20718556}</ProjectGuid>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>pyx</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Sax\pyx.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/example_SAX_simplehander.vcxproj b/vs2013+/example_SAX_simplehander.vcxproj
deleted file mode 100644
index c514c5eb..00000000
--- a/vs2013+/example_SAX_simplehander.vcxproj
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>example_SAX_SimpleHandler</ProjectName>
-    <ProjectGuid>{4D861155-0183-4637-8F01-4F8FDB43C344}</ProjectGuid>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>simplehandler</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Sax\SimpleHandler.cpp" />
-    <ClCompile Include="..\examples\Sax\wrapper.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\examples\Sax\SimpleHandler.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/example_SAX_writer.vcxproj b/vs2013+/example_SAX_writer.vcxproj
deleted file mode 100644
index 47e45565..00000000
--- a/vs2013+/example_SAX_writer.vcxproj
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}</ProjectGuid>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>Writer</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Sax\writer.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/example_SAX_xmlbase.vcxproj b/vs2013+/example_SAX_xmlbase.vcxproj
deleted file mode 100644
index 191cd4b9..00000000
--- a/vs2013+/example_SAX_xmlbase.vcxproj
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>xmlbase</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Sax\xmlbase.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/example_Utils_transcode.vcxproj b/vs2013+/example_Utils_transcode.vcxproj
deleted file mode 100644
index 631b2bad..00000000
--- a/vs2013+/example_Utils_transcode.vcxproj
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{436B423B-BF20-4B2E-A187-604AF391FBE2}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>transcode</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Utils\transcode.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/example_XPath_xgrep.vcxproj b/vs2013+/example_XPath_xgrep.vcxproj
deleted file mode 100644
index f2939a25..00000000
--- a/vs2013+/example_XPath_xgrep.vcxproj
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5F7B038E-5148-4EF4-AB43-5035F666D00D}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>xgrep</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\XPath\xgrep.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="example_DOM_writer.vcxproj">
-      <Project>{c1cf7801-1681-4f15-8d71-bbc814805af2}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/example_XSLT_Mangle.vcxproj b/vs2013+/example_XSLT_Mangle.vcxproj
deleted file mode 100644
index 057bdfb8..00000000
--- a/vs2013+/example_XSLT_Mangle.vcxproj
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{FDF423F0-ACF8-4963-81A4-C886B9174B72}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>mangle</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\examples\Xslt\mangle.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\Xslt\XSLT.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_apply_imports.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_apply_templates.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_attribute.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_call_template.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_choose.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_comment.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_compilation_context.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_compiled_stylesheet.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_copy.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_element.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_execution_context.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_for_each.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_functions.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_if.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_inline_element.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_item.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_key.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_message.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_namespace_stack.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_output.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_param.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_precedence.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_processing_instruction.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_qname.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_sink.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_sort.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_stylesheet.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_stylesheet_compiler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_template.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_text.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_top_level_param.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_value_of.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_variable.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_variable_impl.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_variable_stack.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\xslt_with_param.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_apply_imports_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_apply_templates_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_attribute_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_call_template_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_choose_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_comment_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_copy_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_create_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_element_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_for_each_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_if_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_include_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_inline_element_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_item_container_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_key_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_message_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_namespace_alias_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_output_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_processing_instruction_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_sort_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_template_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_text_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_value_of_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_value_validation.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_variable_handler.hpp" />
-    <ClInclude Include="..\include\Xslt\impl\handler\xslt_with_param_handler.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\tests\XSLT\TO-DO" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/lib_arabica.vcxproj b/vs2013+/lib_arabica.vcxproj
deleted file mode 100644
index 5cb4dc21..00000000
--- a/vs2013+/lib_arabica.vcxproj
+++ /dev/null
@@ -1,388 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>ArabicaLib</ProjectName>
-    <ProjectGuid>{4CA72415-D03A-4447-BE4E-C093A5146CAC}</ProjectGuid>
-    <RootNamespace>ArabicaLib</RootNamespace>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Arabica</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Arabica</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Arabica</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Arabica</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\Sax\AttributeList.hpp" />
-    <ClInclude Include="..\include\Sax\Attributes.hpp" />
-    <ClInclude Include="..\include\Sax\ContentHandler.hpp" />
-    <ClInclude Include="..\include\Sax\DocumentHandler.hpp" />
-    <ClInclude Include="..\include\Sax\DTDHandler.hpp" />
-    <ClInclude Include="..\include\Sax\EntityResolver.hpp" />
-    <ClInclude Include="..\include\Sax\ErrorHandler.hpp" />
-    <ClInclude Include="..\include\Sax\HandlerBase.hpp" />
-    <ClInclude Include="..\include\Sax\InputSource.hpp" />
-    <ClInclude Include="..\include\Sax\IStreamHandle.hpp" />
-    <ClInclude Include="..\include\Sax\Locator.hpp" />
-    <ClInclude Include="..\include\Sax\Parser.hpp" />
-    <ClInclude Include="..\include\Sax\ParserConfig.hpp" />
-    <ClInclude Include="..\include\Sax\SAXException.hpp" />
-    <ClInclude Include="..\include\Sax\saxfwd.hpp" />
-    <ClInclude Include="..\include\Sax\SAXNotRecognizedException.hpp" />
-    <ClInclude Include="..\include\Sax\SAXNotSupportedException.hpp" />
-    <ClInclude Include="..\include\Sax\SAXParseException.hpp" />
-    <ClInclude Include="..\include\Sax\XMLFilter.hpp" />
-    <ClInclude Include="..\include\Sax\XMLReader.hpp" />
-    <ClInclude Include="..\include\Sax\ext\Attributes2.hpp" />
-    <ClInclude Include="..\include\Sax\ext\DeclHandler.hpp" />
-    <ClInclude Include="..\include\Sax\ext\DefaultHandler2.hpp" />
-    <ClInclude Include="..\include\Sax\ext\LexicalHandler.hpp" />
-    <ClInclude Include="..\include\Sax\ext\Locator2.hpp" />
-    <ClInclude Include="..\include\Sax\ext\ProgressiveParser.hpp" />
-    <ClInclude Include="..\include\Sax\filter\NamespaceTracker.hpp" />
-    <ClInclude Include="..\include\Sax\filter\TextCoalescer.hpp" />
-    <ClInclude Include="..\include\Sax\filter\TextOnly.hpp" />
-    <ClInclude Include="..\include\Sax\filter\Writer.hpp" />
-    <ClInclude Include="..\include\Sax\filter\XMLBaseTracker.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\AttributeDefaults.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\AttributeListImpl.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\AttributesImpl.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\AttributeTypes.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\CatchErrorHandler.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\DefaultHandler.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\FeatureNames.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\InputSourceResolver.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\LocatorImpl.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\NamespaceSupport.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\XMLBaseSupport.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\XMLFilterImpl.hpp" />
-    <ClInclude Include="..\include\Sax\parsers\saxgarden.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\saxexpat.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\saxlibxml2.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\saxmsxml2.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\saxxerces.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\XercesFeatureNames.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\XercesPropertyNames.hpp" />
-    <ClInclude Include="..\include\Dom\Attr.hpp" />
-    <ClInclude Include="..\include\Dom\CDATASection.hpp" />
-    <ClInclude Include="..\include\Dom\CharacterData.hpp" />
-    <ClInclude Include="..\include\Dom\Comment.hpp" />
-    <ClInclude Include="..\include\Dom\Document.hpp" />
-    <ClInclude Include="..\include\Dom\DocumentFragment.hpp" />
-    <ClInclude Include="..\include\Dom\DocumentType.hpp" />
-    <ClInclude Include="..\include\Dom\DOMException.hpp" />
-    <ClInclude Include="..\include\Dom\DOMImplementation.hpp" />
-    <ClInclude Include="..\include\Dom\Element.hpp" />
-    <ClInclude Include="..\include\Dom\Entity.hpp" />
-    <ClInclude Include="..\include\Dom\EntityReference.hpp" />
-    <ClInclude Include="..\include\Dom\NamedNodeMap.hpp" />
-    <ClInclude Include="..\include\Dom\Node.hpp" />
-    <ClInclude Include="..\include\Dom\NodeList.hpp" />
-    <ClInclude Include="..\include\Dom\Notation.hpp" />
-    <ClInclude Include="..\include\Dom\ProcessingInstruction.hpp" />
-    <ClInclude Include="..\include\Dom\Proxy.hpp" />
-    <ClInclude Include="..\include\Dom\Text.hpp" />
-    <ClInclude Include="..\include\Dom\DualMode\DualMode.hpp" />
-    <ClInclude Include="..\include\Dom\Events\DocumentEvent.hpp" />
-    <ClInclude Include="..\include\Dom\Events\Event.hpp" />
-    <ClInclude Include="..\include\Dom\Events\EventException.hpp" />
-    <ClInclude Include="..\include\Dom\Events\EventListener.hpp" />
-    <ClInclude Include="..\include\Dom\Events\EventTarget.hpp" />
-    <ClInclude Include="..\include\Dom\Events\MutationEvent.hpp" />
-    <ClInclude Include="..\include\Dom\Sax2dom\DocumentTypeImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Sax2dom\SAX2DOM.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\AttrImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\AttrMap.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\AttrNSImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\CDATASectionImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\CharacterDataImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\CommentImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\DocumentFragmentImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\DocumentImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\DocumentTypeImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\DOMImplementation.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\ElementByTagImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\ElementImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\ElementNSImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\EntityImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\EntityReferenceImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\Helpers.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\NamedNodeMapImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\NodeImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\NotationImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\ProcessingInstructionImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\TextImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\DocumentTraversal.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\DocumentTraversalImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\NodeFilter.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\NodeIterator.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\TraversalImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\TreeWalker.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\TreeWalkerImpl.hpp" />
-    <ClInclude Include="..\include\Dom\io\Stream.hpp" />
-    <ClInclude Include="..\include\XPath\XPath.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_arithmetic.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_ast.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_ast_ids.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_axis_enumerator.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_compile_context.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_execution_context.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_expression.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_expression_impl.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_function.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_function_holder.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_function_resolver.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_grammar.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_logical.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_match.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_match_rewrite.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_namespace_context.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_namespace_node.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_node_test.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_object.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_parser.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_relational.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_resolver_holder.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_step.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_union.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_value.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_variable.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_variable_resolver.hpp" />
-    <ClInclude Include="..\include\Arabica\getparam.hpp" />
-    <ClInclude Include="..\include\Arabica\StringAdaptor.hpp" />
-    <ClInclude Include="..\include\Arabica\stringadaptortag.hpp" />
-    <ClInclude Include="..\include\Xml\escaper.hpp" />
-    <ClInclude Include="..\include\XML\QName.hpp" />
-    <ClInclude Include="..\include\XML\strings.hpp" />
-    <ClInclude Include="..\include\Xml\XMLCharacterClasses.hpp" />
-    <ClInclude Include="..\include\io\convert_adaptor.hpp" />
-    <ClInclude Include="..\include\io\convertstream.hpp" />
-    <ClInclude Include="..\include\io\socket_stream.hpp" />
-    <ClInclude Include="..\include\io\uri.hpp" />
-    <ClInclude Include="..\include\convert\base64codecvt.hpp" />
-    <ClInclude Include="..\include\convert\impl\codecvt_specialisations.hpp" />
-    <ClInclude Include="..\include\convert\impl\iso88591_utf8.hpp" />
-    <ClInclude Include="..\include\convert\iso88591utf8codecvt.hpp" />
-    <ClInclude Include="..\include\convert\rot13codecvt.hpp" />
-    <ClInclude Include="..\include\convert\impl\ucs2_utf16.hpp" />
-    <ClInclude Include="..\include\convert\impl\ucs2_utf8.hpp" />
-    <ClInclude Include="..\include\convert\ucs2utf8codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf16beucs2codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf16leucs2codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf16utf8codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf8iso88591codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf8ucs2codecvt.hpp" />
-    <ClInclude Include="..\include\text\normalize_whitespace.hpp" />
-    <ClInclude Include="..\include\text\UnicodeCharacters.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\Element.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\ElementType.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\html\HTMLModels.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\html\HTMLScanner.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\html\HTMLSchema.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\Parser.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\ScanHandler.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\Scanner.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\Schema.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\SchemaImpl.hpp" />
-    <ClInclude Include="..\include\Taggle\Taggle.hpp" />
-    <ClInclude Include="..\include\XSLT\XSLT.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_apply_imports.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_apply_templates.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_attribute.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_call_template.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_choose.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_comment.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_compilation_context.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_compiled_stylesheet.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_copy.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_element.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_execution_context.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_for_each.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_functions.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_if.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_inline_element.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_item.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_key.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_message.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_namespace_stack.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_output.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_param.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_precedence.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_processing_instruction.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_qname.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_sink.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_sort.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_stylesheet.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_stylesheet_compiler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_stylesheet_parser.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_template.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_text.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_top_level_param.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_value_of.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_variable.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_variable_impl.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_variable_stack.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_with_param.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_apply_imports_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_apply_templates_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_attribute_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_call_template_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_choose_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_comment_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_constants.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_copy_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_create_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_element_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_for_each_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_if_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_include_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_inline_element_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_item_container_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_key_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_message_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_namespace_alias_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_output_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_processing_instruction_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_sort_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_template_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_text_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_value_of_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_value_validation.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_variable_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_with_param_handler.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\arabica.cpp" />
-    <ClCompile Include="..\src\XML\XMLCharacterClasses.cpp" />
-    <ClCompile Include="..\src\SAX\helpers\InputSourceResolver.cpp" />
-    <ClCompile Include="..\src\io\uri.cpp" />
-    <ClCompile Include="..\src\convert\base64codecvt.cpp" />
-    <ClCompile Include="..\src\convert\impl\iso88591_utf8.cpp" />
-    <ClCompile Include="..\src\convert\iso88591utf8codecvt.cpp" />
-    <ClCompile Include="..\src\convert\rot13codecvt.cpp" />
-    <ClCompile Include="..\src\convert\impl\ucs2_utf16.cpp" />
-    <ClCompile Include="..\src\convert\impl\ucs2_utf8.cpp" />
-    <ClCompile Include="..\src\convert\ucs2utf8codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf16beucs2codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf16leucs2codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf16utf8codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf8iso88591codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf8ucs2codecvt.cpp" />
-    <ClCompile Include="..\src\taggle\Schema.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\vs7\ArabicaConfig.S">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /TC /EP -D USE_MSXML ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /TC /EP -D USE_MSXML ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /TC /EP -D USE_MSXML ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">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>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\SAX\ArabicaConfig.hpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\SAX\ArabicaConfig.hpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\SAX\ArabicaConfig.hpp;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/lib_arabica_noboost.vcxproj b/vs2013+/lib_arabica_noboost.vcxproj
deleted file mode 100644
index df24ffc9..00000000
--- a/vs2013+/lib_arabica_noboost.vcxproj
+++ /dev/null
@@ -1,388 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>ArabicaLib</ProjectName>
-    <ProjectGuid>{4CA72415-D03A-4447-BE4E-C093A5146CAC}</ProjectGuid>
-    <RootNamespace>ArabicaLib</RootNamespace>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Arabica</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Arabica</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Arabica</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Arabica</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\Sax\AttributeList.hpp" />
-    <ClInclude Include="..\include\Sax\Attributes.hpp" />
-    <ClInclude Include="..\include\Sax\ContentHandler.hpp" />
-    <ClInclude Include="..\include\Sax\DocumentHandler.hpp" />
-    <ClInclude Include="..\include\Sax\DTDHandler.hpp" />
-    <ClInclude Include="..\include\Sax\EntityResolver.hpp" />
-    <ClInclude Include="..\include\Sax\ErrorHandler.hpp" />
-    <ClInclude Include="..\include\Sax\HandlerBase.hpp" />
-    <ClInclude Include="..\include\Sax\InputSource.hpp" />
-    <ClInclude Include="..\include\Sax\IStreamHandle.hpp" />
-    <ClInclude Include="..\include\Sax\Locator.hpp" />
-    <ClInclude Include="..\include\Sax\Parser.hpp" />
-    <ClInclude Include="..\include\Sax\ParserConfig.hpp" />
-    <ClInclude Include="..\include\Sax\SAXException.hpp" />
-    <ClInclude Include="..\include\Sax\saxfwd.hpp" />
-    <ClInclude Include="..\include\Sax\SAXNotRecognizedException.hpp" />
-    <ClInclude Include="..\include\Sax\SAXNotSupportedException.hpp" />
-    <ClInclude Include="..\include\Sax\SAXParseException.hpp" />
-    <ClInclude Include="..\include\Sax\XMLFilter.hpp" />
-    <ClInclude Include="..\include\Sax\XMLReader.hpp" />
-    <ClInclude Include="..\include\Sax\ext\Attributes2.hpp" />
-    <ClInclude Include="..\include\Sax\ext\DeclHandler.hpp" />
-    <ClInclude Include="..\include\Sax\ext\DefaultHandler2.hpp" />
-    <ClInclude Include="..\include\Sax\ext\LexicalHandler.hpp" />
-    <ClInclude Include="..\include\Sax\ext\Locator2.hpp" />
-    <ClInclude Include="..\include\Sax\ext\ProgressiveParser.hpp" />
-    <ClInclude Include="..\include\Sax\filter\NamespaceTracker.hpp" />
-    <ClInclude Include="..\include\Sax\filter\TextCoalescer.hpp" />
-    <ClInclude Include="..\include\Sax\filter\TextOnly.hpp" />
-    <ClInclude Include="..\include\Sax\filter\Writer.hpp" />
-    <ClInclude Include="..\include\Sax\filter\XMLBaseTracker.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\AttributeDefaults.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\AttributeListImpl.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\AttributesImpl.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\AttributeTypes.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\CatchErrorHandler.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\DefaultHandler.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\FeatureNames.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\InputSourceResolver.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\LocatorImpl.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\NamespaceSupport.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\XMLBaseSupport.hpp" />
-    <ClInclude Include="..\include\Sax\helpers\XMLFilterImpl.hpp" />
-    <ClInclude Include="..\include\Sax\parsers\saxgarden.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\saxexpat.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\saxlibxml2.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\saxmsxml2.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\saxxerces.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\XercesFeatureNames.hpp" />
-    <ClInclude Include="..\include\Sax\wrappers\XercesPropertyNames.hpp" />
-    <ClInclude Include="..\include\Dom\Attr.hpp" />
-    <ClInclude Include="..\include\Dom\CDATASection.hpp" />
-    <ClInclude Include="..\include\Dom\CharacterData.hpp" />
-    <ClInclude Include="..\include\Dom\Comment.hpp" />
-    <ClInclude Include="..\include\Dom\Document.hpp" />
-    <ClInclude Include="..\include\Dom\DocumentFragment.hpp" />
-    <ClInclude Include="..\include\Dom\DocumentType.hpp" />
-    <ClInclude Include="..\include\Dom\DOMException.hpp" />
-    <ClInclude Include="..\include\Dom\DOMImplementation.hpp" />
-    <ClInclude Include="..\include\Dom\Element.hpp" />
-    <ClInclude Include="..\include\Dom\Entity.hpp" />
-    <ClInclude Include="..\include\Dom\EntityReference.hpp" />
-    <ClInclude Include="..\include\Dom\NamedNodeMap.hpp" />
-    <ClInclude Include="..\include\Dom\Node.hpp" />
-    <ClInclude Include="..\include\Dom\NodeList.hpp" />
-    <ClInclude Include="..\include\Dom\Notation.hpp" />
-    <ClInclude Include="..\include\Dom\ProcessingInstruction.hpp" />
-    <ClInclude Include="..\include\Dom\Proxy.hpp" />
-    <ClInclude Include="..\include\Dom\Text.hpp" />
-    <ClInclude Include="..\include\Dom\DualMode\DualMode.hpp" />
-    <ClInclude Include="..\include\Dom\Events\DocumentEvent.hpp" />
-    <ClInclude Include="..\include\Dom\Events\Event.hpp" />
-    <ClInclude Include="..\include\Dom\Events\EventException.hpp" />
-    <ClInclude Include="..\include\Dom\Events\EventListener.hpp" />
-    <ClInclude Include="..\include\Dom\Events\EventTarget.hpp" />
-    <ClInclude Include="..\include\Dom\Events\MutationEvent.hpp" />
-    <ClInclude Include="..\include\Dom\Sax2dom\DocumentTypeImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Sax2dom\SAX2DOM.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\AttrImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\AttrMap.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\AttrNSImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\CDATASectionImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\CharacterDataImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\CommentImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\DocumentFragmentImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\DocumentImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\DocumentTypeImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\DOMImplementation.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\ElementByTagImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\ElementImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\ElementNSImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\EntityImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\EntityReferenceImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\Helpers.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\NamedNodeMapImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\NodeImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\NotationImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\ProcessingInstructionImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Simple\TextImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\DocumentTraversal.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\DocumentTraversalImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\NodeFilter.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\NodeIterator.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\TraversalImpl.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\TreeWalker.hpp" />
-    <ClInclude Include="..\include\Dom\Traversal\TreeWalkerImpl.hpp" />
-    <ClInclude Include="..\include\Dom\io\Stream.hpp" />
-    <ClInclude Include="..\include\XPath\XPath.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_arithmetic.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_ast.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_ast_ids.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_axis_enumerator.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_compile_context.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_execution_context.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_expression.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_expression_impl.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_function.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_function_holder.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_function_resolver.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_grammar.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_logical.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_match.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_match_rewrite.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_namespace_context.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_namespace_node.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_node_test.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_object.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_parser.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_relational.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_resolver_holder.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_step.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_union.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_value.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_variable.hpp" />
-    <ClInclude Include="..\include\XPath\impl\xpath_variable_resolver.hpp" />
-    <ClInclude Include="..\include\Arabica\getparam.hpp" />
-    <ClInclude Include="..\include\Arabica\StringAdaptor.hpp" />
-    <ClInclude Include="..\include\Arabica\stringadaptortag.hpp" />
-    <ClInclude Include="..\include\Xml\escaper.hpp" />
-    <ClInclude Include="..\include\XML\QName.hpp" />
-    <ClInclude Include="..\include\XML\strings.hpp" />
-    <ClInclude Include="..\include\Xml\XMLCharacterClasses.hpp" />
-    <ClInclude Include="..\include\io\convert_adaptor.hpp" />
-    <ClInclude Include="..\include\io\convertstream.hpp" />
-    <ClInclude Include="..\include\io\socket_stream.hpp" />
-    <ClInclude Include="..\include\io\uri.hpp" />
-    <ClInclude Include="..\include\convert\base64codecvt.hpp" />
-    <ClInclude Include="..\include\convert\impl\codecvt_specialisations.hpp" />
-    <ClInclude Include="..\include\convert\impl\iso88591_utf8.hpp" />
-    <ClInclude Include="..\include\convert\iso88591utf8codecvt.hpp" />
-    <ClInclude Include="..\include\convert\rot13codecvt.hpp" />
-    <ClInclude Include="..\include\convert\impl\ucs2_utf16.hpp" />
-    <ClInclude Include="..\include\convert\impl\ucs2_utf8.hpp" />
-    <ClInclude Include="..\include\convert\ucs2utf8codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf16beucs2codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf16leucs2codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf16utf8codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf8iso88591codecvt.hpp" />
-    <ClInclude Include="..\include\convert\utf8ucs2codecvt.hpp" />
-    <ClInclude Include="..\include\text\normalize_whitespace.hpp" />
-    <ClInclude Include="..\include\text\UnicodeCharacters.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\Element.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\ElementType.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\html\HTMLModels.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\html\HTMLScanner.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\html\HTMLSchema.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\Parser.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\ScanHandler.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\Scanner.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\Schema.hpp" />
-    <ClInclude Include="..\include\Taggle\impl\SchemaImpl.hpp" />
-    <ClInclude Include="..\include\Taggle\Taggle.hpp" />
-    <ClInclude Include="..\include\XSLT\XSLT.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_apply_imports.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_apply_templates.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_attribute.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_call_template.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_choose.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_comment.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_compilation_context.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_compiled_stylesheet.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_copy.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_element.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_execution_context.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_for_each.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_functions.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_if.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_inline_element.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_item.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_key.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_message.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_namespace_stack.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_output.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_param.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_precedence.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_processing_instruction.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_qname.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_sink.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_sort.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_stylesheet.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_stylesheet_compiler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_stylesheet_parser.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_template.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_text.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_top_level_param.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_value_of.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_variable.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_variable_impl.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_variable_stack.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\xslt_with_param.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_apply_imports_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_apply_templates_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_attribute_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_call_template_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_choose_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_comment_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_constants.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_copy_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_create_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_element_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_for_each_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_if_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_include_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_inline_element_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_item_container_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_key_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_message_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_namespace_alias_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_output_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_processing_instruction_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_sort_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_template_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_text_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_value_of_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_value_validation.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_variable_handler.hpp" />
-    <ClInclude Include="..\include\XSLT\impl\handler\xslt_with_param_handler.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\arabica.cpp" />
-    <ClCompile Include="..\src\XML\XMLCharacterClasses.cpp" />
-    <ClCompile Include="..\src\SAX\helpers\InputSourceResolver.cpp" />
-    <ClCompile Include="..\src\io\uri.cpp" />
-    <ClCompile Include="..\src\convert\base64codecvt.cpp" />
-    <ClCompile Include="..\src\convert\impl\iso88591_utf8.cpp" />
-    <ClCompile Include="..\src\convert\iso88591utf8codecvt.cpp" />
-    <ClCompile Include="..\src\convert\rot13codecvt.cpp" />
-    <ClCompile Include="..\src\convert\impl\ucs2_utf16.cpp" />
-    <ClCompile Include="..\src\convert\impl\ucs2_utf8.cpp" />
-    <ClCompile Include="..\src\convert\ucs2utf8codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf16beucs2codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf16leucs2codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf16utf8codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf8iso88591codecvt.cpp" />
-    <ClCompile Include="..\src\convert\utf8ucs2codecvt.cpp" />
-    <ClCompile Include="..\src\taggle\Schema.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\vs7\ArabicaConfig.S">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /TC /EP -D USE_MSXML -D NO_BOOST ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /TC /EP -D USE_MSXML -D NO_BOOST ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /TC /EP -D USE_MSXML -D NO_BOOST ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /TC /EP -D USE_MSXML -D NO_BOOST ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\include\SAX\ArabicaConfig.hpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\SAX\ArabicaConfig.hpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\SAX\ArabicaConfig.hpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\SAX\ArabicaConfig.hpp;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/test_DOM.vcxproj b/vs2013+/test_DOM.vcxproj
deleted file mode 100644
index ea2b6995..00000000
--- a/vs2013+/test_DOM.vcxproj
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}</ProjectGuid>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>DOM_test</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\DOM\main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\DOM\dom_conf_test.hpp" />
-    <ClInclude Include="..\tests\DOM\dom_test_suite.hpp" />
-    <ClInclude Include="..\tests\DOM\test_Attribute.hpp" />
-    <ClInclude Include="..\tests\DOM\test_CDATA.hpp" />
-    <ClInclude Include="..\tests\DOM\test_CharacterData.hpp" />
-    <ClInclude Include="..\tests\DOM\test_Document.hpp" />
-    <ClInclude Include="..\tests\DOM\test_DocumentFragment.hpp" />
-    <ClInclude Include="..\tests\DOM\test_DocumentType.hpp" />
-    <ClInclude Include="..\tests\DOM\test_DOMImplementation.hpp" />
-    <ClInclude Include="..\tests\DOM\test_Element.hpp" />
-    <ClInclude Include="..\tests\DOM\test_NamedNodeMap.hpp" />
-    <ClInclude Include="..\tests\DOM\test_ProcessingInstruction.hpp" />
-    <ClInclude Include="..\tests\Dom\test_SAX2DOM.hpp" />
-    <ClInclude Include="..\tests\DOM\test_Siblings.hpp" />
-    <ClInclude Include="..\tests\DOM\test_Text.hpp" />
-    <ClInclude Include="..\tests\DOM\test_TreeWalker.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="CppUnitLib.vcxproj">
-      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/test_DOM_silly.vcxproj b/vs2013+/test_DOM_silly.vcxproj
deleted file mode 100644
index be2055dc..00000000
--- a/vs2013+/test_DOM_silly.vcxproj
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}</ProjectGuid>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>DOM_test_silly</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\DOM\main_silly.cpp" />
-    <ClCompile Include="..\tests\silly_string\silly_string.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Dom\dom_test_suite.hpp" />
-    <ClInclude Include="..\tests\silly_string\silly_string.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Attribute.hpp" />
-    <ClInclude Include="..\tests\Dom\test_CDATA.hpp" />
-    <ClInclude Include="..\tests\Dom\test_CharacterData.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Document.hpp" />
-    <ClInclude Include="..\tests\Dom\test_DocumentFragment.hpp" />
-    <ClInclude Include="..\tests\Dom\test_DocumentType.hpp" />
-    <ClInclude Include="..\tests\Dom\test_DOMImplementation.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Element.hpp" />
-    <ClInclude Include="..\tests\Dom\test_ProcessingInstruction.hpp" />
-    <ClInclude Include="..\tests\Dom\test_SAX2DOM.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Siblings.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Text.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="CppUnitLib.vcxproj">
-      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_utils.vcxproj">
-      <Project>{fa1a13a0-07d3-4fc9-a2d2-9f5fa8c3c3a4}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/test_DOM_wide.vcxproj b/vs2013+/test_DOM_wide.vcxproj
deleted file mode 100644
index 12b2c5fa..00000000
--- a/vs2013+/test_DOM_wide.vcxproj
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DE6FD811-12BD-4914-BA29-CD987C4B0D48}</ProjectGuid>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>DOM_test_wide</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\DOM\main_wide.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\DOM\dom_test_suite.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Attribute.hpp" />
-    <ClInclude Include="..\tests\Dom\test_CDATA.hpp" />
-    <ClInclude Include="..\tests\Dom\test_CharacterData.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Document.hpp" />
-    <ClInclude Include="..\tests\Dom\test_DocumentFragment.hpp" />
-    <ClInclude Include="..\tests\Dom\test_DocumentType.hpp" />
-    <ClInclude Include="..\tests\Dom\test_DOMImplementation.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Element.hpp" />
-    <ClInclude Include="..\tests\Dom\test_ProcessingInstruction.hpp" />
-    <ClInclude Include="..\tests\Dom\test_SAX2DOM.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Siblings.hpp" />
-    <ClInclude Include="..\tests\Dom\test_Text.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="CppUnitLib.vcxproj">
-      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM_silly.vcxproj">
-      <Project>{7d957e35-93d3-4c9e-a5ef-4b0620ce758c}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_utils.vcxproj">
-      <Project>{fa1a13a0-07d3-4fc9-a2d2-9f5fa8c3c3a4}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/test_SAX_filter.vcxproj b/vs2013+/test_SAX_filter.vcxproj
deleted file mode 100644
index a2a05371..00000000
--- a/vs2013+/test_SAX_filter.vcxproj
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}</ProjectGuid>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>sax_filter_test</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\Sax\filter_test.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Sax\test_WhitespaceStripper.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="CppUnitLib.vcxproj">
-      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_utils.vcxproj">
-      <Project>{fa1a13a0-07d3-4fc9-a2d2-9f5fa8c3c3a4}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/test_SAX_filter_silly.vcxproj b/vs2013+/test_SAX_filter_silly.vcxproj
deleted file mode 100644
index f604cbaf..00000000
--- a/vs2013+/test_SAX_filter_silly.vcxproj
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}</ProjectGuid>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>sax_filter_test_silly</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\Sax\filter_test_silly.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Sax\test_WhitespaceStripper.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="CppUnitLib.vcxproj">
-      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/test_SAX_filter_wide.vcxproj b/vs2013+/test_SAX_filter_wide.vcxproj
deleted file mode 100644
index a611899f..00000000
--- a/vs2013+/test_SAX_filter_wide.vcxproj
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{FB5B88E9-DAB3-401C-B413-77403C562C49}</ProjectGuid>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>sax_filter_test_wide</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\Sax\filter_test_wide.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Sax\test_WhitespaceStripper.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="CppUnitLib.vcxproj">
-      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/test_utils.vcxproj b/vs2013+/test_utils.vcxproj
deleted file mode 100644
index 385210b6..00000000
--- a/vs2013+/test_utils.vcxproj
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>utils_test</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\Utils\utils_test.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Utils\test_base64.hpp" />
-    <ClInclude Include="..\tests\Utils\test_normalize_whitespace.hpp" />
-    <ClInclude Include="..\tests\Utils\test_qname.hpp" />
-    <ClInclude Include="..\tests\Utils\test_uri.hpp" />
-    <ClInclude Include="..\tests\Utils\test_xml_strings.hpp" />
-    <ClInclude Include="..\tests\Utils\util_test_suite.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="CppUnitLib.vcxproj">
-      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/test_xpath.vcxproj b/vs2013+/test_xpath.vcxproj
deleted file mode 100644
index 5b235714..00000000
--- a/vs2013+/test_xpath.vcxproj
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>xpath_test</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\XPath\main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\XPath\arithmetic_test.hpp" />
-    <ClInclude Include="..\tests\XPath\attr_value_test.hpp" />
-    <ClInclude Include="..\tests\XPath\axis_enumerator_test.hpp" />
-    <ClInclude Include="..\tests\XPath\execute_test.hpp" />
-    <ClInclude Include="..\tests\XPath\expression_test.hpp" />
-    <ClInclude Include="..\tests\XPath\logical_test.hpp" />
-    <ClInclude Include="..\tests\XPath\match_test.hpp" />
-    <ClInclude Include="..\tests\XPath\node_test_test.hpp" />
-    <ClInclude Include="..\tests\XPath\parse_test.hpp" />
-    <ClInclude Include="..\tests\XPath\relational_test.hpp" />
-    <ClInclude Include="..\tests\XPath\step_test.hpp" />
-    <ClInclude Include="..\tests\XPath\text_node_test.hpp" />
-    <ClInclude Include="..\tests\XPath\value_test.hpp" />
-    <ClInclude Include="..\tests\XPath\xpath_test_suite.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="CppUnitLib.vcxproj">
-      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/test_xpath_silly.vcxproj b/vs2013+/test_xpath_silly.vcxproj
deleted file mode 100644
index 641f38aa..00000000
--- a/vs2013+/test_xpath_silly.vcxproj
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{92BC362C-4B23-4444-A9A8-81933D01D283}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>xpath_test_silly</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\XPath\main_silly.cpp" />
-    <ClCompile Include="..\tests\silly_string\silly_string.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\XPath\arithmetic_test.hpp" />
-    <ClInclude Include="..\tests\XPath\attr_value_test.hpp" />
-    <ClInclude Include="..\tests\XPath\axis_enumerator_test.hpp" />
-    <ClInclude Include="..\tests\XPath\execute_test.hpp" />
-    <ClInclude Include="..\tests\XPath\expression_test.hpp" />
-    <ClInclude Include="..\tests\XPath\logical_test.hpp" />
-    <ClInclude Include="..\tests\XPath\match_test.hpp" />
-    <ClInclude Include="..\tests\XPath\node_test_test.hpp" />
-    <ClInclude Include="..\tests\XPath\parse_test.hpp" />
-    <ClInclude Include="..\tests\XPath\relational_test.hpp" />
-    <ClInclude Include="..\tests\silly_string\silly_string.hpp" />
-    <ClInclude Include="..\tests\XPath\step_test.hpp" />
-    <ClInclude Include="..\tests\XPath\value_test.hpp" />
-    <ClInclude Include="..\tests\XPath\xpath_test_suite.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="CppUnitLib.vcxproj">
-      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_xpath.vcxproj">
-      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/test_xpath_wide.vcxproj b/vs2013+/test_xpath_wide.vcxproj
deleted file mode 100644
index 2ca575c7..00000000
--- a/vs2013+/test_xpath_wide.vcxproj
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>xpath_test_wide</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\XPath\main_wide.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\XPath\arithmetic_test.hpp" />
-    <ClInclude Include="..\tests\XPath\attr_value_test.hpp" />
-    <ClInclude Include="..\tests\XPath\axis_enumerator_test.hpp" />
-    <ClInclude Include="..\tests\XPath\execute_test.hpp" />
-    <ClInclude Include="..\tests\XPath\expression_test.hpp" />
-    <ClInclude Include="..\tests\XPath\logical_test.hpp" />
-    <ClInclude Include="..\tests\XPath\match_test.hpp" />
-    <ClInclude Include="..\tests\XPath\node_test_test.hpp" />
-    <ClInclude Include="..\tests\XPath\parse_test.hpp" />
-    <ClInclude Include="..\tests\XPath\relational_test.hpp" />
-    <ClInclude Include="..\tests\XPath\step_test.hpp" />
-    <ClInclude Include="..\tests\XPath\value_test.hpp" />
-    <ClInclude Include="..\tests\XPath\xpath_test_suite.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="CppUnitLib.vcxproj">
-      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_xpath.vcxproj">
-      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/test_xslt.vcxproj b/vs2013+/test_xslt.vcxproj
deleted file mode 100644
index e10c164d..00000000
--- a/vs2013+/test_xslt.vcxproj
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{44BA3424-C58E-4A49-ADDD-6180C61E5E34}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>xslt_test</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\Xslt\main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Xslt\xslt_test.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\tests\XSLT\testsuite\TESTS\arabica-catalog.xml" />
-    <None Include="..\tests\Xslt\testsuite\Tests\arabica-expected-fails.xml" />
-    <None Include="..\tests\Xslt\testsuite\Tests\catalog.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="CppUnitLib.vcxproj">
-      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_xpath.vcxproj">
-      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/test_xslt_silly.vcxproj b/vs2013+/test_xslt_silly.vcxproj
deleted file mode 100644
index a835e28c..00000000
--- a/vs2013+/test_xslt_silly.vcxproj
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9FBD30C4-8588-49A8-95E4-471307B57F7E}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>xslt_test_silly</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\silly_string\silly_string.cpp" />
-    <ClCompile Include="..\tests\Xslt\main_silly.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Xslt\xslt_test.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\tests\XSLT\testsuite\TESTS\arabica-catalog.xml" />
-    <None Include="..\tests\Xslt\testsuite\Tests\arabica-expected-fails.xml" />
-    <None Include="..\tests\Xslt\testsuite\Tests\catalog.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="CppUnitLib.vcxproj">
-      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_xpath.vcxproj">
-      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/test_xslt_wide.vcxproj b/vs2013+/test_xslt_wide.vcxproj
deleted file mode 100644
index ce9ed260..00000000
--- a/vs2013+/test_xslt_wide.vcxproj
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Arabica.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <TargetName>xslt_test_wide</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/bigobj</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\Xslt\main_wide.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Xslt\xslt_test.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\tests\XSLT\testsuite\TESTS\arabica-catalog.xml" />
-    <None Include="..\tests\Xslt\testsuite\Tests\arabica-expected-fails.xml" />
-    <None Include="..\tests\Xslt\testsuite\Tests\catalog.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="CppUnitLib.vcxproj">
-      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_xpath.vcxproj">
-      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs2013+/test_xslt_wide.vcxproj.bak b/vs2013+/test_xslt_wide.vcxproj.bak
deleted file mode 100644
index f6a714e9..00000000
--- a/vs2013+/test_xslt_wide.vcxproj.bak
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{44BA3424-C58E-4A49-ADDD-6180C61E5E34}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(LatestTargetPlatformVersion)'!=''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_xslt\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_xslt\</IntDir>
-    <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>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>NotSet</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>
-      </OptimizeReferences>
-      <EnableCOMDATFolding>
-      </EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>NotSet</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\tests\Xslt\main_wide.cpp" />
-    <ClCompile Include="..\tests\XSLT\xslt_test.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\tests\Xslt\xslt_test.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\tests\XSLT\testsuite\TESTS\arabica-catalog.xml" />
-    <None Include="..\tests\Xslt\testsuite\Tests\arabica-expected-fails.xml" />
-    <None Include="..\tests\Xslt\testsuite\Tests\catalog.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lib_arabica.vcxproj">
-      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_DOM.vcxproj">
-      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="test_xpath.vcxproj">
-      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vs7/ArabicaConfig.S b/vs7/ArabicaConfig.S
deleted file mode 100644
index e4e5b9c6..00000000
--- a/vs7/ArabicaConfig.S
+++ /dev/null
@@ -1,71 +0,0 @@
-#define pasty(m, n) m##n
-#define include pasty(#, include)
-#define ifdef pasty(#, ifdef)
-#define ifndef pasty(#, ifndef)
-#define endif pasty(#, endif)
-#define define pasty(#, define)
-#define message pasty(#, pragma message)
-#define undef pasty(#, undef)
-#define error pasty(#, error)
-#define else pasty(#, else)
-#define comment pasty(#, pragma comment)
-
-
-ifndef ARABICA_ARABICA_CONFIG_H
-define ARABICA_ARABICA_CONFIG_H
-
-#ifdef ARABICA_NO_WCHAR_T
-#undef ARABICA_NO_WCHAR_T
-define ARABICA_NO_WCHAR_T
-#endif
-
-#ifdef _MSC_VER
-#if (_MSC_VER < 1300)
-define ARABICA_VS6_WORKAROUND
-#endif
-
-define ARABICA_NO_CODECVT_SPECIALISATIONS
-#endif
-
-#ifndef NO_BOOST
-define HAVE_BOOST
-#endif
-
-#ifndef NO_WINDOWS
-define ARABICA_USE_WINSOCK
-define ARABICA_WINDOWS
-#endif
-
-#if defined(_DEBUG) || (__DEBUG__)
-define ARABICA_DEBUG
-#endif
-
-#ifdef USE_LIBXML2
-#undef USE_LIBXML2
-define ARABICA_USE_LIBXML2
-#endif
-
-#ifdef USE_EXPAT
-#undef USE_EXPAT
-define ARABICA_USE_EXPAT
-#endif
-
-#ifdef USE_XERCES
-#undef USE_XERCES
-define ARABICA_USE_XERCES
-#endif
-
-#ifdef USE_GARDEN
-#undef USE_GARDEN
-define ARABICA_USE_GARDEN
-define ARABICA_NO_WCHAR_T
-#endif
-
-#ifdef USE_MSXML
-#undef USE_MSXML
-define ARABICA_USE_MSXML
-#endif			
-				
-endif
-
-
diff --git a/vs7/README.txt b/vs7/README.txt
deleted file mode 100644
index 883dd99f..00000000
--- a/vs7/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Arabica no longer ships with solution or project files for Visual Studio 7/2003.
-You can generate them using the vs9\projfix.py script.  I can't guarantee the generated files will work, but they the last time I ran it.
diff --git a/vs8/README.txt b/vs8/README.txt
deleted file mode 100644
index 629b98ef..00000000
--- a/vs8/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Arabica no longer ships with solution or project files for Visual Studio 8/2005.
-You can generate them using the vs9\projfix.py script.  I can't guarantee the generated files will work, but they the last time I ran it.
diff --git a/vs9/Arabica.sln b/vs9/Arabica.sln
deleted file mode 100644
index 45b5f05e..00000000
--- a/vs9/Arabica.sln
+++ /dev/null
@@ -1,110 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica.vcproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_Pyx", "example_SAX_pyx.vcproj", "{5214A867-2768-4CD0-9E29-6EED20718556}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_SimpleHandler", "example_SAX_simplehander.vcproj", "{4D861155-0183-4637-8F01-4F8FDB43C344}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_Writer", "example_SAX_writer.vcproj", "{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_XMLBase", "example_SAX_xmlbase.vcproj", "{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_DOM_Writer", "example_DOM_writer.vcproj", "{C1CF7801-1681-4F15-8D71-BBC814805AF2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A} = {1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787} = {C57BA030-A81F-4EA2-9CB6-D1BE2404B787}
-		{4D861155-0183-4637-8F01-4F8FDB43C344} = {4D861155-0183-4637-8F01-4F8FDB43C344}
-		{5214A867-2768-4CD0-9E29-6EED20718556} = {5214A867-2768-4CD0-9E29-6EED20718556}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_Utils_Transcode", "example_Utils_transcode.vcproj", "{436B423B-BF20-4B2E-A187-604AF391FBE2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_XPath_xgrep", "example_XPath_xgrep.vcproj", "{5F7B038E-5148-4EF4-AB43-5035F666D00D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2} = {C1CF7801-1681-4F15-8D71-BBC814805AF2}
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_XSLT_Mangle", "example_XSLT_Mangle.vcproj", "{FDF423F0-ACF8-4963-81A4-C886B9174B72}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D} = {5F7B038E-5148-4EF4-AB43-5035F666D00D}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_Taggle", "example_SAX_Taggle.vcproj", "{274EB942-0AA8-4715-8419-4722868A22BA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A} = {1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787} = {C57BA030-A81F-4EA2-9CB6-D1BE2404B787}
-		{4D861155-0183-4637-8F01-4F8FDB43C344} = {4D861155-0183-4637-8F01-4F8FDB43C344}
-		{5214A867-2768-4CD0-9E29-6EED20718556} = {5214A867-2768-4CD0-9E29-6EED20718556}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.Build.0 = Debug|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.ActiveCfg = Release|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.Build.0 = Release|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.Build.0 = Debug|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.ActiveCfg = Release|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.Build.0 = Release|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.Build.0 = Debug|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.ActiveCfg = Release|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.Build.0 = Release|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.Build.0 = Debug|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.ActiveCfg = Release|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.Build.0 = Release|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.Build.0 = Debug|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.ActiveCfg = Release|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.Build.0 = Release|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.Build.0 = Debug|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.ActiveCfg = Release|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.Build.0 = Release|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Debug|Win32.Build.0 = Debug|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Release|Win32.ActiveCfg = Release|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Release|Win32.Build.0 = Release|Win32
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Debug|Win32.Build.0 = Debug|Win32
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Release|Win32.ActiveCfg = Release|Win32
-		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Release|Win32.Build.0 = Release|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.Build.0 = Debug|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.ActiveCfg = Release|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vs9/Arabica_noboost.sln b/vs9/Arabica_noboost.sln
deleted file mode 100644
index b0658a21..00000000
--- a/vs9/Arabica_noboost.sln
+++ /dev/null
@@ -1,88 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_Pyx", "example_SAX_pyx.vcproj", "{5214A867-2768-4CD0-9E29-6EED20718556}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{436B423B-BF20-4B2E-A187-604AF391FBE2} = {436B423B-BF20-4B2E-A187-604AF391FBE2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_SimpleHandler", "example_SAX_simplehander.vcproj", "{4D861155-0183-4637-8F01-4F8FDB43C344}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{436B423B-BF20-4B2E-A187-604AF391FBE2} = {436B423B-BF20-4B2E-A187-604AF391FBE2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_Writer", "example_SAX_writer.vcproj", "{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{436B423B-BF20-4B2E-A187-604AF391FBE2} = {436B423B-BF20-4B2E-A187-604AF391FBE2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_XMLBase", "example_SAX_xmlbase.vcproj", "{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{436B423B-BF20-4B2E-A187-604AF391FBE2} = {436B423B-BF20-4B2E-A187-604AF391FBE2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_DOM_Writer", "example_DOM_writer.vcproj", "{C1CF7801-1681-4F15-8D71-BBC814805AF2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A} = {1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787} = {C57BA030-A81F-4EA2-9CB6-D1BE2404B787}
-		{436B423B-BF20-4B2E-A187-604AF391FBE2} = {436B423B-BF20-4B2E-A187-604AF391FBE2}
-		{4D861155-0183-4637-8F01-4F8FDB43C344} = {4D861155-0183-4637-8F01-4F8FDB43C344}
-		{5214A867-2768-4CD0-9E29-6EED20718556} = {5214A867-2768-4CD0-9E29-6EED20718556}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_Utils_Transcode", "example_Utils_transcode.vcproj", "{436B423B-BF20-4B2E-A187-604AF391FBE2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica_noboost.vcproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_Taggle", "example_SAX_Taggle.vcproj", "{274EB942-0AA8-4715-8419-4722868A22BA}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.Build.0 = Debug|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.ActiveCfg = Release|Win32
-		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.Build.0 = Release|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.Build.0 = Debug|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.ActiveCfg = Release|Win32
-		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.Build.0 = Release|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.Build.0 = Debug|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.ActiveCfg = Release|Win32
-		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.Build.0 = Release|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.Build.0 = Debug|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.ActiveCfg = Release|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.Build.0 = Release|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.Build.0 = Debug|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.ActiveCfg = Release|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.Build.0 = Release|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.Build.0 = Debug|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.ActiveCfg = Release|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.Build.0 = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.Build.0 = Debug|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.ActiveCfg = Release|Win32
-		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vs9/Arabica_noboost_tests.sln b/vs9/Arabica_noboost_tests.sln
deleted file mode 100644
index 45db68f7..00000000
--- a/vs9/Arabica_noboost_tests.sln
+++ /dev/null
@@ -1,102 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM", "test_DOM.vcproj", "{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-		{FB5B88E9-DAB3-401C-B413-77403C562C49} = {FB5B88E9-DAB3-401C-B413-77403C562C49}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_silly", "test_DOM_silly.vcproj", "{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-		{FB5B88E9-DAB3-401C-B413-77403C562C49} = {FB5B88E9-DAB3-401C-B413-77403C562C49}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_wide", "test_DOM_wide.vcproj", "{DE6FD811-12BD-4914-BA29-CD987C4B0D48}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C} = {7D957E35-93D3-4C9E-A5EF-4B0620CE758C}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-		{FB5B88E9-DAB3-401C-B413-77403C562C49} = {FB5B88E9-DAB3-401C-B413-77403C562C49}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_utils", "test_utils.vcproj", "{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter", "test_SAX_filter.vcproj", "{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_silly", "test_SAX_filter_silly.vcproj", "{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_wide", "test_SAX_filter_wide.vcproj", "{FB5B88E9-DAB3-401C-B413-77403C562C49}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica_noboost.vcproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.Build.0 = Debug|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.ActiveCfg = Release|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.Build.0 = Release|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.Build.0 = Debug|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.ActiveCfg = Release|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.Build.0 = Release|Win32
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|Win32.ActiveCfg = Debug|Win32
-		{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
-		{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
-		{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
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vs9/Arabica_tests.sln b/vs9/Arabica_tests.sln
deleted file mode 100644
index 9b4f53f7..00000000
--- a/vs9/Arabica_tests.sln
+++ /dev/null
@@ -1,188 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica.vcproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM", "test_DOM.vcproj", "{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC} = {894C6ACE-97EE-497B-BC2C-310E6AC82EFC}
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-		{FB5B88E9-DAB3-401C-B413-77403C562C49} = {FB5B88E9-DAB3-401C-B413-77403C562C49}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_silly", "test_DOM_silly.vcproj", "{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC} = {894C6ACE-97EE-497B-BC2C-310E6AC82EFC}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_wide", "test_DOM_wide.vcproj", "{DE6FD811-12BD-4914-BA29-CD987C4B0D48}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C} = {7D957E35-93D3-4C9E-A5EF-4B0620CE758C}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC} = {894C6ACE-97EE-497B-BC2C-310E6AC82EFC}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xpath", "test_xpath.vcproj", "{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48} = {DE6FD811-12BD-4914-BA29-CD987C4B0D48}
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C} = {7D957E35-93D3-4C9E-A5EF-4B0620CE758C}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC} = {894C6ACE-97EE-497B-BC2C-310E6AC82EFC}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xpath_silly", "test_xpath_silly.vcproj", "{92BC362C-4B23-4444-A9A8-81933D01D283}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48} = {DE6FD811-12BD-4914-BA29-CD987C4B0D48}
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C} = {7D957E35-93D3-4C9E-A5EF-4B0620CE758C}
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE} = {B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC} = {894C6ACE-97EE-497B-BC2C-310E6AC82EFC}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xpath_wide", "test_xpath_wide.vcproj", "{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48} = {DE6FD811-12BD-4914-BA29-CD987C4B0D48}
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{92BC362C-4B23-4444-A9A8-81933D01D283} = {92BC362C-4B23-4444-A9A8-81933D01D283}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C} = {7D957E35-93D3-4C9E-A5EF-4B0620CE758C}
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE} = {B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE} = {B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC} = {894C6ACE-97EE-497B-BC2C-310E6AC82EFC}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_utils", "test_utils.vcproj", "{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC} = {894C6ACE-97EE-497B-BC2C-310E6AC82EFC}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xslt", "test_xslt.vcproj", "{44BA3424-C58E-4A49-ADDD-6180C61E5E34}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48} = {DE6FD811-12BD-4914-BA29-CD987C4B0D48}
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{92BC362C-4B23-4444-A9A8-81933D01D283} = {92BC362C-4B23-4444-A9A8-81933D01D283}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C} = {7D957E35-93D3-4C9E-A5EF-4B0620CE758C}
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE} = {B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE} = {B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE} = {B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE} = {B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE} = {B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA} = {EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC} = {894C6ACE-97EE-497B-BC2C-310E6AC82EFC}
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-		{FB5B88E9-DAB3-401C-B413-77403C562C49} = {FB5B88E9-DAB3-401C-B413-77403C562C49}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter", "test_SAX_filter.vcproj", "{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC} = {894C6ACE-97EE-497B-BC2C-310E6AC82EFC}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_silly", "test_SAX_filter_silly.vcproj", "{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC} = {894C6ACE-97EE-497B-BC2C-310E6AC82EFC}
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_wide", "test_SAX_filter_wide.vcproj", "{FB5B88E9-DAB3-401C-B413-77403C562C49}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC} = {894C6ACE-97EE-497B-BC2C-310E6AC82EFC}
-		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnitLib", "CppUnitLib.vcproj", "{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.Build.0 = Debug|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.ActiveCfg = Release|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.Build.0 = Release|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.Build.0 = Debug|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.ActiveCfg = Release|Win32
-		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.Build.0 = Release|Win32
-		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|Win32.ActiveCfg = Debug|Win32
-		{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
-		{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
-		{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
-		{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
-		{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
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|Win32.Build.0 = Debug|Win32
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|Win32.ActiveCfg = Release|Win32
-		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vs9/CppUnitLib.vcproj b/vs9/CppUnitLib.vcproj
deleted file mode 100644
index 70caed29..00000000
--- a/vs9/CppUnitLib.vcproj
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="CppUnitLib"
-	ProjectGUID="{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}"
-	RootNamespace="CppUnitLib"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\lib"
-			IntermediateDirectory=".\Debug_CppUnit"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\CppUnit-debug.lib  "
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\lib"
-			IntermediateDirectory=".\Release_CppUnit"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="src"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\tests\CppUnit\textui\TableTestResult.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\CppUnit\framework\TestCase.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\CppUnit\framework\TestFailure.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\CppUnit\framework\TestResult.cpp"
-				>
-			</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\textui\TextTestResult.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\CppUnit\textui\XmlTestResult.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="include"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<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\textui\TableTestResult.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\CppUnit\framework\Test.h"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\CppUnit\framework\TestCaller.h"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\CppUnit\framework\TestCase.h"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\CppUnit\framework\TestFailure.h"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\CppUnit\framework\TestResult.h"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\CppUnit\framework\TestSuite.h"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\CppUnit\textui\TextTestResult.h"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\CppUnit\textui\XmlTestResult.hpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/example_DOM_writer.vcproj b/vs9/example_DOM_writer.vcproj
deleted file mode 100644
index 8a30666f..00000000
--- a/vs9/example_DOM_writer.vcproj
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="example_DOM_Writer"
-	ProjectGUID="{C1CF7801-1681-4F15-8D71-BBC814805AF2}"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_examples_DOM_writer"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib"
-				OutputFile="$(OutDir)/DOMWriter.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/DOMWriter.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_examples_DOM_writer"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				TreatWChar_tAsBuiltInType="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/DOMWriter.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
-			>
-			<File
-				RelativePath="..\examples\Dom\DOMWriter.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/example_SAX_Taggle.vcproj b/vs9/example_SAX_Taggle.vcproj
deleted file mode 100644
index d01aa324..00000000
--- a/vs9/example_SAX_Taggle.vcproj
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="example_SAX_Taggle"
-	ProjectGUID="{274EB942-0AA8-4715-8419-4722868A22BA}"
-	RootNamespace="example_SAX_Taggle"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_example_SAX_taggle"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\..\include"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib"
-				OutputFile="$(OutDir)\taggle.exe"
-				GenerateDebugInformation="true"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_example_SAX_taggle"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories=".\..\include"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				TreatWChar_tAsBuiltInType="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)\taggle.exe"
-				GenerateDebugInformation="true"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\examples\Taggle\taggle.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/example_SAX_pyx.vcproj b/vs9/example_SAX_pyx.vcproj
deleted file mode 100644
index c89d4376..00000000
--- a/vs9/example_SAX_pyx.vcproj
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="example_SAX_Pyx"
-	ProjectGUID="{5214A867-2768-4CD0-9E29-6EED20718556}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_examples_SAX_pyx"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm200&#x0A;"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\Debug_examples_SAX_pyx/pyx.pch"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib"
-				OutputFile="$(OutDir)/pyx.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/pyx.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_examples_SAX_pyx"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<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_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"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/pyx.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\examples\Sax\pyx.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/example_SAX_simplehander.vcproj b/vs9/example_SAX_simplehander.vcproj
deleted file mode 100644
index 8197559a..00000000
--- a/vs9/example_SAX_simplehander.vcproj
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="example_SAX_SimpleHandler"
-	ProjectGUID="{4D861155-0183-4637-8F01-4F8FDB43C344}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_examples_SAX_simple"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm200&#x0A;"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib"
-				OutputFile="$(OutDir)/SimpleHandler.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/SimpleHandler.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_examples_SAX_simple"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<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/SimpleHandler.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/SimpleHandler.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\examples\Sax\SimpleHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\examples\Sax\wrapper.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\examples\Sax\SimpleHandler.hpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/example_SAX_writer.vcproj b/vs9/example_SAX_writer.vcproj
deleted file mode 100644
index e521c08b..00000000
--- a/vs9/example_SAX_writer.vcproj
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="example_SAX_Writer"
-	ProjectGUID="{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_examples_SAX_writer"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm200&#x0A;"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\Debug/Writer.pch"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib"
-				OutputFile="$(OutDir)/Writer.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/Writer.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_examples_SAX_writer"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<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="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
-				AdditionalIncludeDirectories=""
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/Writer.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\examples\Sax\writer.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/example_SAX_xmlbase.vcproj b/vs9/example_SAX_xmlbase.vcproj
deleted file mode 100644
index a4b10f21..00000000
--- a/vs9/example_SAX_xmlbase.vcproj
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="example_SAX_XMLBase"
-	ProjectGUID="{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_examples_SAX_xmlbase"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib"
-				OutputFile="$(OutDir)/XMLBase.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/XMLBase.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_examples_SAX_xmlbase"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				TreatWChar_tAsBuiltInType="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/XMLBase.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\examples\Sax\xmlbase.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/example_Utils_transcode.vcproj b/vs9/example_Utils_transcode.vcproj
deleted file mode 100644
index 14b8f3fc..00000000
--- a/vs9/example_Utils_transcode.vcproj
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="example_Utils_Transcode"
-	ProjectGUID="{436B423B-BF20-4B2E-A187-604AF391FBE2}"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_example_Utils_transcode"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib"
-				OutputFile="$(OutDir)/transcode.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/transcode.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_example_Utils_transcode"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				TreatWChar_tAsBuiltInType="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/transcode.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
-			>
-			<File
-				RelativePath="..\examples\Utils\transcode.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/example_XPath_xgrep.vcproj b/vs9/example_XPath_xgrep.vcproj
deleted file mode 100644
index 694ed4f8..00000000
--- a/vs9/example_XPath_xgrep.vcproj
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="example_XPath_xgrep"
-	ProjectGUID="{5F7B038E-5148-4EF4-AB43-5035F666D00D}"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\bin"
-			IntermediateDirectory=".\Debug_example_xpath_xgrep"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib"
-				OutputFile="$(OutDir)/xgrep.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/xgrep.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\bin"
-			IntermediateDirectory=".\Release_example_xpath_xgrep"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				TreatWChar_tAsBuiltInType="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/XPath.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\examples\XPath\xgrep.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/example_XSLT_Mangle.vcproj b/vs9/example_XSLT_Mangle.vcproj
deleted file mode 100644
index 7657cbf3..00000000
--- a/vs9/example_XSLT_Mangle.vcproj
+++ /dev/null
@@ -1,464 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="example_XSLT_Mangle"
-	ProjectGUID="{FDF423F0-ACF8-4963-81A4-C886B9174B72}"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\bin"
-			IntermediateDirectory="Debug_example_XSLT_mangle"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib"
-				OutputFile="$(OutDir)/mangle.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/mangle.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\bin"
-			IntermediateDirectory="Release_example_XSLT_mangle"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				MinimalRebuild="false"
-				RuntimeLibrary="2"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/mangle.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source"
-			>
-			<File
-				RelativePath="..\examples\Xslt\mangle.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="XSLT"
-			>
-			<File
-				RelativePath="..\include\Xslt\XSLT.hpp"
-				>
-			</File>
-			<Filter
-				Name="impl"
-				>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_apply_imports.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_apply_templates.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_attribute.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_call_template.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_choose.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_comment.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_compilation_context.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_compiled_stylesheet.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_copy.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_element.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_execution_context.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_for_each.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_functions.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_if.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_inline_element.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_item.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_key.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_message.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_namespace_stack.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_output.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_param.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_precedence.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_processing_instruction.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_qname.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_sink.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_sort.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_stylesheet.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_stylesheet_compiler.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_template.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_text.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_top_level_param.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_value_of.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_variable.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_variable_impl.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_variable_stack.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xslt\impl\xslt_with_param.hpp"
-					>
-				</File>
-				<Filter
-					Name="handler"
-					>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_apply_imports_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_apply_templates_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_attribute_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_call_template_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_choose_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_comment_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_copy_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_create_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_element_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_for_each_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_if_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_include_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_inline_element_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_item_container_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_key_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_message_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_namespace_alias_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_output_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_processing_instruction_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_sort_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_template_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_text_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_value_of_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_value_validation.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_variable_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Xslt\impl\handler\xslt_with_param_handler.hpp"
-						>
-					</File>
-				</Filter>
-			</Filter>
-		</Filter>
-		<File
-			RelativePath="..\tests\XSLT\TO-DO"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/lib_arabica.vcproj b/vs9/lib_arabica.vcproj
deleted file mode 100644
index 0151e2da..00000000
--- a/vs9/lib_arabica.vcproj
+++ /dev/null
@@ -1,1345 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="ArabicaLib"
-	ProjectGUID="{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-	RootNamespace="ArabicaLib"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\lib"
-			IntermediateDirectory=".\Debug_Arabica"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName="$(OutDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\lib\Arabica-debug.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\lib"
-			IntermediateDirectory=".\Release_Arabica"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				TreatWChar_tAsBuiltInType="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\Release/SAX.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\lib\Arabica.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="include"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<Filter
-				Name="SAX"
-				>
-				<File
-					RelativePath="..\include\Sax\AttributeList.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\Attributes.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\ContentHandler.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\DocumentHandler.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\DTDHandler.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\EntityResolver.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\ErrorHandler.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\HandlerBase.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\InputSource.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\IStreamHandle.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\Locator.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\Parser.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\ParserConfig.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\SAXException.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\saxfwd.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\SAXNotRecognizedException.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\SAXNotSupportedException.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\SAXParseException.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\XMLFilter.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\XMLReader.hpp"
-					>
-				</File>
-				<Filter
-					Name="ext"
-					>
-					<File
-						RelativePath="..\include\Sax\ext\Attributes2.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\DeclHandler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\DefaultHandler2.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\LexicalHandler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\Locator2.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\ProgressiveParser.hpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="filter"
-					>
-					<File
-						RelativePath="..\include\Sax\filter\NamespaceTracker.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\filter\TextCoalescer.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\filter\TextOnly.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\filter\Writer.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\filter\XMLBaseTracker.hpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="helpers"
-					>
-					<File
-						RelativePath="..\include\Sax\helpers\AttributeDefaults.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\AttributeListImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\AttributesImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\AttributeTypes.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\CatchErrorHandler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\DefaultHandler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\FeatureNames.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\InputSourceResolver.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\LocatorImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\NamespaceSupport.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\XMLBaseSupport.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\XMLFilterImpl.hpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="parsers"
-					>
-					<File
-						RelativePath="..\include\Sax\parsers\saxgarden.hpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="wrappers"
-					>
-					<File
-						RelativePath="..\include\Sax\wrappers\saxexpat.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\saxlibxml2.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\saxmsxml2.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\saxxerces.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\XercesFeatureNames.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\XercesPropertyNames.hpp"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="DOM"
-				>
-				<File
-					RelativePath="..\include\Dom\Attr.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\CDATASection.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\CharacterData.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Comment.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Document.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\DocumentFragment.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\DocumentType.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\DOMException.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\DOMImplementation.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Element.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Entity.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\EntityReference.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\NamedNodeMap.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Node.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\NodeList.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Notation.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\ProcessingInstruction.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Proxy.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Text.hpp"
-					>
-				</File>
-				<Filter
-					Name="DualMode"
-					>
-					<File
-						RelativePath="..\include\Dom\DualMode\DualMode.hpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Events"
-					>
-					<File
-						RelativePath="..\include\Dom\Events\DocumentEvent.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Events\Event.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Events\EventException.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Events\EventListener.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Events\EventTarget.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Events\MutationEvent.hpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="SAX2DOM"
-					>
-					<File
-						RelativePath="..\include\Dom\Sax2dom\DocumentTypeImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Sax2dom\SAX2DOM.hpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Simple"
-					>
-					<File
-						RelativePath="..\include\Dom\Simple\AttrImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\AttrMap.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\AttrNSImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\CDATASectionImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\CharacterDataImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\CommentImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\DocumentFragmentImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\DocumentImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\DocumentTypeImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\DOMImplementation.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\ElementByTagImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\ElementImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\ElementNSImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\EntityImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\EntityReferenceImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\Helpers.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\NamedNodeMapImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\NodeImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\NotationImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\ProcessingInstructionImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\TextImpl.hpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Traversal"
-					>
-					<File
-						RelativePath="..\include\Dom\Traversal\DocumentTraversal.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Traversal\DocumentTraversalImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Traversal\NodeFilter.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Traversal\NodeIterator.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Traversal\TraversalImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Traversal\TreeWalker.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Traversal\TreeWalkerImpl.hpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="io"
-					>
-					<File
-						RelativePath="..\include\Dom\io\Stream.hpp"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="XPath"
-				>
-				<File
-					RelativePath="..\include\XPath\XPath.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_arithmetic.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_ast.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_ast_ids.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_axis_enumerator.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_compile_context.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_execution_context.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_expression.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_expression_impl.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_function.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_function_holder.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_function_resolver.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_grammar.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_logical.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_match.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_match_rewrite.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_namespace_context.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_namespace_node.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_node_test.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_object.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_parser.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_relational.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_resolver_holder.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_step.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_union.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_value.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_variable.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_variable_resolver.hpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Arabica"
-				>
-				<File
-					RelativePath="..\include\Arabica\getparam.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Arabica\StringAdaptor.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Arabica\stringadaptortag.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Arabica\impl\VS6Workaround.hpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="XML"
-				>
-				<File
-					RelativePath="..\include\Xml\escaper.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XML\QName.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XML\strings.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xml\XMLCharacterClasses.hpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="io"
-				>
-				<File
-					RelativePath="..\include\io\convert_adaptor.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\io\convertstream.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\io\socket_stream.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\io\uri.hpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="convert"
-				>
-				<File
-					RelativePath="..\include\convert\base64codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\impl\codecvt_specialisations.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\impl\iso88591_utf8.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\iso88591utf8codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\rot13codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\impl\ucs2_utf16.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\impl\ucs2_utf8.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\ucs2utf8codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\utf16beucs2codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\utf16leucs2codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\utf16utf8codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\utf8iso88591codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\utf8ucs2codecvt.hpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="text"
-				>
-				<File
-					RelativePath="..\include\text\normalize_whitespace.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\text\UnicodeCharacters.hpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Taggle"
-				>
-				<File
-					RelativePath="..\include\Taggle\impl\Element.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Taggle\impl\ElementType.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Taggle\impl\html\HTMLModels.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Taggle\impl\html\HTMLScanner.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Taggle\impl\html\HTMLSchema.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Taggle\impl\Parser.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Taggle\impl\ScanHandler.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Taggle\impl\Scanner.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Taggle\impl\Schema.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Taggle\impl\SchemaImpl.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Taggle\Taggle.hpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="XSLT"
-				>
-				<File
-					RelativePath="..\include\XSLT\XSLT.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_apply_imports.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_apply_templates.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_attribute.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_call_template.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_choose.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_comment.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_compilation_context.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_compiled_stylesheet.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_copy.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_element.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_execution_context.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_for_each.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_functions.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_if.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_inline_element.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_item.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_key.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_message.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_namespace_stack.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_output.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_param.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_precedence.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_processing_instruction.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_qname.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_sink.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_sort.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_stylesheet.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_stylesheet_compiler.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_stylesheet_parser.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_template.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_text.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_top_level_param.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_value_of.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_variable.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_variable_impl.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_variable_stack.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XSLT\impl\xslt_with_param.hpp"
-					>
-				</File>
-				<Filter
-					Name="handlers"
-					>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_apply_imports_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_apply_templates_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_attribute_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_call_template_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_choose_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_comment_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_constants.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_copy_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_create_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_element_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_for_each_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_if_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_include_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_inline_element_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_item_container_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_key_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_message_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_namespace_alias_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_output_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_processing_instruction_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_sort_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_strip_space_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_template_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_text_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_value_of_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_value_validation.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_variable_handler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\XSLT\impl\handler\xslt_with_param_handler.hpp"
-						>
-					</File>
-				</Filter>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="src"
-			>
-			<File
-				RelativePath="..\src\arabica.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\vs7\ArabicaConfig.S"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="cl /TC /EP -D ARABICA_USE_MSXML ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp&#x0D;&#x0A;"
-						Outputs="..\include\SAX\ArabicaConfig.hpp"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="cl /TC /EP -D USE_MSXML ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp&#x0D;&#x0A;"
-						Outputs="..\include\SAX\ArabicaConfig.hpp"
-					/>
-				</FileConfiguration>
-			</File>
-			<Filter
-				Name="XML"
-				>
-				<File
-					RelativePath="..\src\XML\XMLCharacterClasses.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="SAX"
-				>
-				<Filter
-					Name="Helpers"
-					>
-					<File
-						RelativePath="..\src\SAX\helpers\InputSourceResolver.cpp"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="io"
-				>
-				<File
-					RelativePath="..\src\io\uri.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="convert"
-				>
-				<File
-					RelativePath="..\src\convert\base64codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\impl\iso88591_utf8.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\iso88591utf8codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\rot13codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\impl\ucs2_utf16.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\impl\ucs2_utf8.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\ucs2utf8codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\utf16beucs2codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\utf16leucs2codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\utf16utf8codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\utf8iso88591codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\utf8ucs2codecvt.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="taggle"
-				>
-				<File
-					RelativePath="..\src\taggle\Schema.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/lib_arabica_noboost.vcproj b/vs9/lib_arabica_noboost.vcproj
deleted file mode 100644
index 19a39c84..00000000
--- a/vs9/lib_arabica_noboost.vcproj
+++ /dev/null
@@ -1,1005 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="ArabicaLib"
-	ProjectGUID="{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-	RootNamespace="ArabicaLib"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\lib"
-			IntermediateDirectory=".\Debug_Arabica"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName="$(OutDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\lib\Arabica-debug.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\lib"
-			IntermediateDirectory=".\Release_Arabica"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				TreatWChar_tAsBuiltInType="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\Release/SAX.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\lib\Arabica.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="include"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<Filter
-				Name="SAX"
-				>
-				<File
-					RelativePath="..\include\Sax\AttributeList.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\Attributes.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\ContentHandler.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\DocumentHandler.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\DTDHandler.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\EntityResolver.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\ErrorHandler.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\HandlerBase.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\InputSource.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\IStreamHandle.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\Locator.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\Parser.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\ParserConfig.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\SAXException.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\saxfwd.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\SAXNotRecognizedException.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\SAXNotSupportedException.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\SAXParseException.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\XMLFilter.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\XMLReader.hpp"
-					>
-				</File>
-				<Filter
-					Name="ext"
-					>
-					<File
-						RelativePath="..\include\Sax\ext\Attributes2.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\DeclHandler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\DefaultHandler2.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\LexicalHandler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\Locator2.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\ProgressiveParser.hpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="filter"
-					>
-					<File
-						RelativePath="..\include\Sax\filter\NamespaceTracker.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\filter\TextCoalescer.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\filter\TextOnly.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\filter\Writer.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\filter\XMLBaseTracker.hpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="helpers"
-					>
-					<File
-						RelativePath="..\include\Sax\helpers\AttributeDefaults.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\AttributeListImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\AttributesImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\AttributeTypes.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\CatchErrorHandler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\DefaultHandler.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\FeatureNames.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\InputSourceResolver.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\LocatorImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\NamespaceSupport.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\XMLBaseSupport.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\XMLFilterImpl.hpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="parsers"
-					>
-					<File
-						RelativePath="..\include\Sax\parsers\saxgarden.hpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="wrappers"
-					>
-					<File
-						RelativePath="..\include\Sax\wrappers\saxexpat.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\saxlibxml2.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\saxmsxml2.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\saxxerces.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\XercesFeatureNames.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\XercesPropertyNames.hpp"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="DOM"
-				>
-				<File
-					RelativePath="..\include\Dom\Attr.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\CDATASection.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\CharacterData.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Comment.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Document.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\DocumentFragment.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\DocumentType.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\DOMException.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\DOMImplementation.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Element.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Entity.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\EntityReference.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\NamedNodeMap.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Node.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\NodeList.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Notation.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\ProcessingInstruction.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Proxy.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Text.hpp"
-					>
-				</File>
-				<Filter
-					Name="DualMode"
-					>
-					<File
-						RelativePath="..\include\Dom\DualMode\DualMode.hpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Events"
-					>
-					<File
-						RelativePath="..\include\Dom\Events\DocumentEvent.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Events\Event.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Events\EventException.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Events\EventListener.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Events\EventTarget.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Events\MutationEvent.hpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="SAX2DOM"
-					>
-					<File
-						RelativePath="..\include\Dom\Sax2dom\DocumentTypeImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Sax2dom\SAX2DOM.hpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Simple"
-					>
-					<File
-						RelativePath="..\include\Dom\Simple\AttrImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\AttrMap.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\AttrNSImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\CDATASectionImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\CharacterDataImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\CommentImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\DocumentFragmentImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\DocumentImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\DocumentTypeImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\DOMImplementation.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\ElementByTagImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\ElementImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\ElementNSImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\EntityImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\EntityReferenceImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\Helpers.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\NamedNodeMapImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\NodeImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\NotationImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\ProcessingInstructionImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\TextImpl.hpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Traversal"
-					>
-					<File
-						RelativePath="..\include\Dom\Traversal\DocumentTraversal.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Traversal\DocumentTraversalImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Traversal\NodeFilter.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Traversal\NodeIterator.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Traversal\TraversalImpl.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Traversal\TreeWalker.hpp"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Traversal\TreeWalkerImpl.hpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="io"
-					>
-					<File
-						RelativePath="..\include\Dom\io\Stream.hpp"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="XPath"
-				>
-				<File
-					RelativePath="..\include\XPath\XPath.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_arithmetic.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_ast.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_ast_ids.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_axis_enumerator.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_compile_context.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_execution_context.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_expression.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_function.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_function_holder.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_function_resolver.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_grammar.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_logical.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_match.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_match_rewrite.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_namespace_context.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_namespace_node.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_node_test.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_object.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_parser.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_relational.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_resolver_holder.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_step.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_union.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_value.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_variable.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_variable_resolver.hpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Arabica"
-				>
-				<File
-					RelativePath="..\include\Arabica\getparam.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Arabica\StringAdaptor.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Arabica\stringadaptortag.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Arabica\impl\VS6Workaround.hpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="XML"
-				>
-				<File
-					RelativePath="..\include\Xml\escaper.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xml\XMLCharacterClasses.hpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="io"
-				>
-				<File
-					RelativePath="..\include\io\convert_adaptor.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\io\convertstream.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\io\socket_stream.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\io\uri.hpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="convert"
-				>
-				<File
-					RelativePath="..\include\convert\base64codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\impl\codecvt_specialisations.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\impl\iso88591_utf8.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\iso88591utf8codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\rot13codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\impl\ucs2_utf16.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\impl\ucs2_utf8.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\ucs2utf8codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\utf16beucs2codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\utf16leucs2codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\utf16utf8codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\utf8iso88591codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\convert\utf8ucs2codecvt.hpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="text"
-				>
-				<File
-					RelativePath="..\include\text\normalize_whitespace.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\text\UnicodeCharacters.hpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="src"
-			>
-			<File
-				RelativePath="..\src\arabica.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\vs7\ArabicaConfig.S"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="cl /TC /EP -D USE_MSXML -D NO_BOOST ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp&#x0D;&#x0A;"
-						Outputs="..\include\SAX\ArabicaConfig.hpp"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="cl /TC /EP -D USE_MSXML ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp&#x0D;&#x0A;"
-						Outputs="..\include\SAX\ArabicaConfig.hpp"
-					/>
-				</FileConfiguration>
-			</File>
-			<Filter
-				Name="XML"
-				>
-				<File
-					RelativePath="..\src\XML\XMLCharacterClasses.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="SAX"
-				>
-				<Filter
-					Name="Helpers"
-					>
-					<File
-						RelativePath="..\src\SAX\helpers\InputSourceResolver.cpp"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="io"
-				>
-				<File
-					RelativePath="..\src\io\uri.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="convert"
-				>
-				<File
-					RelativePath="..\src\convert\base64codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\impl\iso88591_utf8.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\iso88591utf8codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\rot13codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\impl\ucs2_utf16.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\impl\ucs2_utf8.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\ucs2utf8codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\utf16beucs2codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\utf16leucs2codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\utf16utf8codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\utf8iso88591codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\convert\utf8ucs2codecvt.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/projfix.py b/vs9/projfix.py
deleted file mode 100644
index 5b59bb69..00000000
--- a/vs9/projfix.py
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/python
-
-import os
-import re
-
-print "Mangling project files for older Visual Studio versions"
-
-versions = [ ['8.00', 'vs8'],
-             ['7.10', 'vs7'] ]
-
-for version in versions:
-  number = version[0]
-  subdir = version[1]
-
-  print "  version %s in ..\%s" % (number, subdir)
-
-  projects = [p for p in os.listdir('.') if re.search('vcproj$', p)]
-  for project in projects:
-    newproject = "..\%s\%s" % (subdir, project)
-    print "    %s -> %s " % (project, newproject)
-
-    p = open(project)
-    np = open(newproject, 'w')
-   
-    for l in p.readlines():
-      if re.search("TargetFrameworkVersion", l):
-        continue
-      if re.search("Version=", l):
-        l = l.replace('9.00', number)
-      np.write(l)
-    np.close()
-    p.close()
diff --git a/vs9/test_DOM.vcproj b/vs9/test_DOM.vcproj
deleted file mode 100644
index f7a9ad46..00000000
--- a/vs9/test_DOM.vcproj
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test_DOM"
-	ProjectGUID="{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_test_DOM"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<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_test_DOM/DOM_test.pch"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib ..\lib\CppUnit-debug.lib"
-				OutputFile="$(OutDir)/DOM_test.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/DOM_test.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_test_DOM"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<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_test_DOM/DOM_test.pch"
-				AssemblerListingLocation=".\Release_test_DOM/"
-				ObjectFile=".\Release_test_DOM/"
-				ProgramDataBaseFileName=".\Release_test_DOM/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/DOM_test.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath=".\..\tests\DOM\main.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath=".\..\tests\DOM\dom_test_suite.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_Attribute.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_CDATA.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_CharacterData.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_Document.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_DocumentFragment.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_DocumentType.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_DOMImplementation.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_Element.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\DOM\test_NamedNodeMap.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_ProcessingInstruction.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_SAX2DOM.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_Siblings.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\DOM\test_Stream.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_Text.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\DOM\test_TreeWalker.hpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/test_DOM_silly.vcproj b/vs9/test_DOM_silly.vcproj
deleted file mode 100644
index 9f41fc19..00000000
--- a/vs9/test_DOM_silly.vcproj
+++ /dev/null
@@ -1,281 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test_DOM_silly"
-	ProjectGUID="{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}"
-	RootNamespace="test_DOM_silly"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_test_DOM_silly"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<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_test_DOM/SAX2DOM_test.pch"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib ..\lib\CppUnit-debug.lib"
-				OutputFile="$(OutDir)/DOM_test_silly.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_test_DOM_silly"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<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_test_DOM/DOM_test.pch"
-				AssemblerListingLocation=".\Release_test_DOM/"
-				ObjectFile=".\Release_test_DOM/"
-				ProgramDataBaseFileName=".\Release_test_DOM/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/DOM_test_silly.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\Release_test_DOM/DOM_test_silly.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\tests\DOM\main_silly.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\silly_string\silly_string.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\tests\Dom\dom_test_suite.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\silly_string\silly_string.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Attribute.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_CDATA.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_CharacterData.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Document.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_DocumentFragment.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_DocumentType.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_DOMImplementation.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Element.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_ProcessingInstruction.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_SAX2DOM.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Siblings.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\DOM\test_Stream.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Text.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\DOM\test_TreeWalker.hpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/test_DOM_wide.vcproj b/vs9/test_DOM_wide.vcproj
deleted file mode 100644
index 6ac89949..00000000
--- a/vs9/test_DOM_wide.vcproj
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test_DOM_wide"
-	ProjectGUID="{DE6FD811-12BD-4914-BA29-CD987C4B0D48}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_test_DOM"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<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_test_DOM/SAX2DOM_test.pch"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib  ..\lib\CppUnit-debug.lib"
-				OutputFile="$(OutDir)/DOM_test_wide.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/DOM_test_wide.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_test_DOM_wide"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<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_test_DOM/DOM_test.pch"
-				AssemblerListingLocation=".\Release_test_DOM/"
-				ObjectFile=".\Release_test_DOM/"
-				ProgramDataBaseFileName=".\Release_test_DOM/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/DOM_test_wide.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\tests\DOM\main_wide.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\tests\DOM\dom_test_suite.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Attribute.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_CDATA.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_CharacterData.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Document.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_DocumentFragment.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_DocumentType.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_DOMImplementation.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Element.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_ProcessingInstruction.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_SAX2DOM.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Siblings.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\DOM\test_Stream.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Text.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\DOM\test_TreeWalker.hpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/test_SAX_filter.vcproj b/vs9/test_SAX_filter.vcproj
deleted file mode 100644
index 3a077b4f..00000000
--- a/vs9/test_SAX_filter.vcproj
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test_SAX_filter"
-	ProjectGUID="{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}"
-	RootNamespace="test_SAX_filter"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\bin"
-			IntermediateDirectory=".\Debug_test_SAXFilter"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm200&#x0A;"
-				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="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\lib\arabica-debug.lib ..\lib\CppUnit-debug.lib"
-				OutputFile="$(OutDir)/sax_filter_test.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/sax_filter_test.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\bin"
-			IntermediateDirectory=".\Release_test_SAXFilter"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<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="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
-				AdditionalIncludeDirectories=""
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/sax_filter_test.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</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="Header Files"
-			>
-			<File
-				RelativePath="..\tests\Sax\test_WhitespaceStripper.hpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/test_SAX_filter_silly.vcproj b/vs9/test_SAX_filter_silly.vcproj
deleted file mode 100644
index 4c185189..00000000
--- a/vs9/test_SAX_filter_silly.vcproj
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test_SAX_filter_silly"
-	ProjectGUID="{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\bin"
-			IntermediateDirectory=".\Debug_test_SAXFilter_silly"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm200&#x0D;&#x0A;"
-				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="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\lib\arabica-debug.lib ..\lib\CppUnit-debug.lib"
-				OutputFile="$(OutDir)/sax_filter_test_ss.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/sax_filter_test_ss.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\bin"
-			IntermediateDirectory=".\Release_test_SAXFilter_silly"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<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="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
-				AdditionalIncludeDirectories=""
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/sax_filter_test_ss.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</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="Header Files"
-			>
-			<File
-				RelativePath="..\tests\Sax\test_WhitespaceStripper.hpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/test_SAX_filter_wide.vcproj b/vs9/test_SAX_filter_wide.vcproj
deleted file mode 100644
index 18a984d2..00000000
--- a/vs9/test_SAX_filter_wide.vcproj
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test_SAX_filter_wide"
-	ProjectGUID="{FB5B88E9-DAB3-401C-B413-77403C562C49}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\bin"
-			IntermediateDirectory=".\Debug_test_SAXFilter_wide"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm200&#x0D;&#x0A;"
-				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="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\lib\arabica-debug.lib ..\lib\CppUnit-debug.lib"
-				OutputFile="$(OutDir)/sax_filter_test_wide.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/sax_filter_test_wide.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\bin"
-			IntermediateDirectory=".\Release_test_SAXFilter_wide"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<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="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
-				AdditionalIncludeDirectories=""
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/sax_filter_test_wide.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</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="Header Files"
-			>
-			<File
-				RelativePath="..\tests\Sax\test_WhitespaceStripper.hpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/test_utils.vcproj b/vs9/test_utils.vcproj
deleted file mode 100644
index dd740d1f..00000000
--- a/vs9/test_utils.vcproj
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test_utils"
-	ProjectGUID="{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_test_utils"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib ..\lib\CppUnit-debug.lib"
-				OutputFile="$(OutDir)/utils_test.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/utils_test.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_test_utils"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				DisableLanguageExtensions="true"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/utils_test.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\tests\Utils\utils_test.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\tests\Utils\test_base64.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Utils\test_normalize_whitespace.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Utils\test_qname.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Utils\test_uri.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Utils\test_xml_strings.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Utils\util_test_suite.hpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/test_xpath.vcproj b/vs9/test_xpath.vcproj
deleted file mode 100644
index 05e92899..00000000
--- a/vs9/test_xpath.vcproj
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test_xpath"
-	ProjectGUID="{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_test_xpath"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib ..\lib\CppUnit-debug.lib"
-				OutputFile="$(OutDir)/xpath_test.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/xpath_test.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_test_xpath"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/xpath_test.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\tests\XPath\main.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\tests\XPath\arithmetic_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\attr_value_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\axis_enumerator_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\execute_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\expression_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\logical_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\match_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\node_test_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\parse_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\relational_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\step_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\text_node_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\value_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\xpath_test_suite.hpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/test_xpath_silly.vcproj b/vs9/test_xpath_silly.vcproj
deleted file mode 100644
index 07a5ff01..00000000
--- a/vs9/test_xpath_silly.vcproj
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test_xpath_silly"
-	ProjectGUID="{92BC362C-4B23-4444-A9A8-81933D01D283}"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_test_xpath_silly"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="false"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib ..\lib\CppUnit-debug.lib"
-				OutputFile="$(OutDir)/xpath_test_ss.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/xpath_test_ss.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_test_xpath_silly"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/xpath_test_ss.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\tests\XPath\main_silly.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\silly_string\silly_string.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			>
-			<File
-				RelativePath="..\tests\XPath\arithmetic_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\attr_value_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\axis_enumerator_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\execute_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\expression_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\logical_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\match_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\node_test_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\parse_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\relational_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\silly_string\silly_string.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\step_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\value_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\xpath_test_suite.hpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/test_xpath_wide.vcproj b/vs9/test_xpath_wide.vcproj
deleted file mode 100644
index f1756eb9..00000000
--- a/vs9/test_xpath_wide.vcproj
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test_xpath_wide"
-	ProjectGUID="{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_test_xpath_wide"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="false"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib ..\lib\CppUnit-debug.lib"
-				OutputFile="$(OutDir)/xpath_test_wide.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/xpath_test_wide.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_test_xpath_wide"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/xpath_test_wide.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\tests\XPath\main_wide.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			>
-			<File
-				RelativePath="..\tests\XPath\arithmetic_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\attr_value_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\axis_enumerator_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\execute_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\expression_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\logical_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\match_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\node_test_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\parse_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\relational_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\step_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\value_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\xpath_test_suite.hpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs9/test_xslt.vcproj b/vs9/test_xslt.vcproj
deleted file mode 100644
index c701adeb..00000000
--- a/vs9/test_xslt.vcproj
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test_xslt"
-	ProjectGUID="{44BA3424-C58E-4A49-ADDD-6180C61E5E34}"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_test_xslt"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib ..\lib\CppUnit-debug.lib"
-				OutputFile="$(OutDir)/xslt_test.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/xslt_test.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_test_xslt"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/xslt_test.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="false"
-				SubSystem="1"
-				OptimizeReferences="0"
-				EnableCOMDATFolding="0"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\tests\Xslt\main.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XSLT\xslt_test.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\tests\Xslt\xslt_test.hpp"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\tests\XSLT\testsuite\TESTS\arabica-catalog.xml"
-			>
-		</File>
-		<File
-			RelativePath="..\tests\Xslt\testsuite\Tests\arabica-expected-fails.xml"
-			>
-		</File>
-		<File
-			RelativePath="..\tests\Xslt\testsuite\Tests\catalog.xml"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>