From 38d9ad2524bc195370fec28196e0b4d7c5435810 Mon Sep 17 00:00:00 2001
From: jez <>
Date: Tue, 8 Aug 2006 10:30:59 +0000
Subject: [PATCH] updated solution and project files for new directory
 structure

---
 SAX/SAX.vcproj                        | 1288 +++++++++++++------------
 examples/SAX/SimpleHandler.vcproj     |    4 +-
 examples/SAX/Writer.vcproj            |    4 +-
 examples/SAX/example_XMLBase.vcproj   |    4 +-
 examples/SAX/pyx.vcproj               |    4 +-
 examples/SAX2DOM/DOMWriter.vcproj     |    4 +-
 examples/Utils/transcode.vcproj       |    4 +-
 examples/XPath/xgrep.vcproj           |    4 +-
 test/DOM/DOM_test.vcproj              |    4 +-
 test/DOM_silly/DOM_test_silly.vcproj  |    4 +-
 test/DOM_wide/DOM_test_wide.vcproj    |    4 +-
 test/SAX/FilterTest.vcproj            |    4 +-
 test/SAX2DOM/SAX2DOM_test.vcproj      |    4 +-
 test/XPath/xpathic.vcproj             |    4 +-
 test/XPath_silly/xpathic_silly.vcproj |    4 +-
 test/XPath_wide/xpathic_wide.vcproj   |    4 +-
 16 files changed, 684 insertions(+), 664 deletions(-)

diff --git a/SAX/SAX.vcproj b/SAX/SAX.vcproj
index 1a90b193..04c19983 100644
--- a/SAX/SAX.vcproj
+++ b/SAX/SAX.vcproj
@@ -23,7 +23,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -78,7 +78,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -124,657 +124,677 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Header Files"
+			Name="include"
 			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath=".\AttributeList.h">
-			</File>
-			<File
-				RelativePath=".\Attributes.h">
-			</File>
-			<File
-				RelativePath=".\ContentHandler.h">
-			</File>
-			<File
-				RelativePath=".\DocumentHandler.h">
-			</File>
-			<File
-				RelativePath=".\DTDHandler.h">
-			</File>
-			<File
-				RelativePath=".\EntityResolver.h">
-			</File>
-			<File
-				RelativePath=".\ErrorHandler.h">
-			</File>
-			<File
-				RelativePath=".\HandlerBase.h">
-			</File>
-			<File
-				RelativePath=".\InputSource.h">
-			</File>
-			<File
-				RelativePath="IStreamHandle.h">
-			</File>
-			<File
-				RelativePath=".\Locator.h">
-			</File>
-			<File
-				RelativePath=".\Parser.h">
-			</File>
-			<File
-				RelativePath=".\ParserConfig.h">
-			</File>
-			<File
-				RelativePath=".\SAXException.h">
-			</File>
-			<File
-				RelativePath=".\saxfwd.h">
-			</File>
-			<File
-				RelativePath=".\SAXNotRecognizedException.h">
-			</File>
-			<File
-				RelativePath=".\SAXNotSupportedException.h">
-			</File>
-			<File
-				RelativePath=".\SAXParseException.h">
-			</File>
-			<File
-				RelativePath=".\XMLFilter.h">
-			</File>
-			<File
-				RelativePath=".\XMLReader.h">
-			</File>
+			<Filter
+				Name="XPath"
+				Filter="">
+				<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_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="DOM"
+				Filter="">
+				<File
+					RelativePath="..\include\Dom\Attr.h">
+				</File>
+				<File
+					RelativePath="..\include\Dom\CDATASection.h">
+				</File>
+				<File
+					RelativePath="..\include\Dom\CharacterData.h">
+				</File>
+				<File
+					RelativePath="..\include\Dom\Comment.h">
+				</File>
+				<File
+					RelativePath="..\include\Dom\Document.h">
+				</File>
+				<File
+					RelativePath="..\include\Dom\DocumentFragment.h">
+				</File>
+				<File
+					RelativePath="..\include\Dom\DocumentType.h">
+				</File>
+				<File
+					RelativePath="..\include\Dom\DOMException.h">
+				</File>
+				<File
+					RelativePath="..\include\Dom\DOMImplementation.h">
+				</File>
+				<File
+					RelativePath="..\include\Dom\Element.h">
+				</File>
+				<File
+					RelativePath="..\include\Dom\Entity.h">
+				</File>
+				<File
+					RelativePath="..\include\Dom\EntityReference.h">
+				</File>
+				<File
+					RelativePath="..\include\Dom\NamedNodeMap.h">
+				</File>
+				<File
+					RelativePath="..\include\Dom\Node.h">
+				</File>
+				<File
+					RelativePath="..\include\Dom\NodeList.h">
+				</File>
+				<File
+					RelativePath="..\include\Dom\Notation.h">
+				</File>
+				<File
+					RelativePath="..\include\Dom\ProcessingInstruction.h">
+				</File>
+				<File
+					RelativePath="..\include\Dom\Proxy.h">
+				</File>
+				<File
+					RelativePath="..\include\Dom\Text.h">
+				</File>
+				<Filter
+					Name="DualMode"
+					Filter="">
+					<File
+						RelativePath="..\include\Dom\DualMode\DualMode.hpp">
+					</File>
+				</Filter>
+				<Filter
+					Name="Events"
+					Filter="">
+					<File
+						RelativePath="..\include\Dom\Events\DocumentEvent.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Events\Event.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Events\EventException.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Events\EventListener.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Events\EventTarget.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Events\MutationEvent.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="SAX2DOM"
+					Filter="">
+					<File
+						RelativePath="..\include\Dom\Sax2dom\DocumentTypeImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Sax2dom\SAX2DOM.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="Simple"
+					Filter="">
+					<File
+						RelativePath="..\include\Dom\Simple\AttrImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\AttrMap.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\AttrNSImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\CDATASectionImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\CharacterDataImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\CommentImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\DocumentFragmentImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\DocumentImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\DocumentTypeImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\DOMImplementation.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\ElementByTagImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\ElementImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\ElementNSImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\EntityImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\EntityReferenceImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\Helpers.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\NamedNodeMapImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\NodeImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\NotationImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\ProcessingInstructionImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Simple\TextImpl.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="Traversal"
+					Filter="">
+					<File
+						RelativePath="..\include\Dom\Traversal\DocumentTraversal.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Traversal\NodeFilter.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Traversal\NodeIterator.h">
+					</File>
+					<File
+						RelativePath="..\include\Dom\Traversal\TreeWalker.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="Utils"
+					Filter="">
+					<File
+						RelativePath="..\include\Dom\Utils\Stream.h">
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="Utils"
+				Filter="">
+				<File
+					RelativePath="..\include\Utils\base64codecvt.h">
+				</File>
+				<File
+					RelativePath="..\include\Utils\impl\codecvt_specialisations.h">
+				</File>
+				<File
+					RelativePath="..\include\Utils\convert_adaptor.h">
+				</File>
+				<File
+					RelativePath="..\include\Utils\convertstream.h">
+				</File>
+				<File
+					RelativePath="..\include\Utils\getparam.hpp">
+				</File>
+				<File
+					RelativePath="..\include\Utils\impl\iso88591_utf8.h">
+				</File>
+				<File
+					RelativePath="..\include\Utils\iso88591utf8codecvt.h">
+				</File>
+				<File
+					RelativePath="..\include\Utils\rot13codecvt.h">
+				</File>
+				<File
+					RelativePath="..\include\Utils\socket_stream.h">
+				</File>
+				<File
+					RelativePath="..\include\Utils\StringAdaptor.h">
+				</File>
+				<File
+					RelativePath="..\include\Utils\stringadaptortag.hpp">
+				</File>
+				<File
+					RelativePath="..\include\Utils\impl\ucs2_utf16.h">
+				</File>
+				<File
+					RelativePath="..\include\Utils\impl\ucs2_utf8.h">
+				</File>
+				<File
+					RelativePath="..\include\Utils\ucs2utf8codecvt.hpp">
+				</File>
+				<File
+					RelativePath="..\include\Utils\utf16beucs2codecvt.h">
+				</File>
+				<File
+					RelativePath="..\include\Utils\utf16leucs2codecvt.h">
+				</File>
+				<File
+					RelativePath="..\include\Utils\utf16utf8codecvt.h">
+				</File>
+				<File
+					RelativePath="..\include\Utils\utf8iso88591codecvt.h">
+				</File>
+				<File
+					RelativePath="..\include\Utils\utf8ucs2codecvt.h">
+				</File>
+				<File
+					RelativePath="..\include\Utils\impl\VS6Workaround.h">
+				</File>
+			</Filter>
+			<Filter
+				Name="XML"
+				Filter="">
+				<File
+					RelativePath="..\include\Xml\escaper.hpp">
+				</File>
+				<File
+					RelativePath="..\include\Xml\UnicodeCharacters.h">
+				</File>
+				<File
+					RelativePath="..\include\Xml\XMLCharacterClasses.h">
+				</File>
+			</Filter>
+			<Filter
+				Name="SAX"
+				Filter="">
+				<File
+					RelativePath="..\include\Sax\AttributeList.h">
+				</File>
+				<File
+					RelativePath="..\include\Sax\Attributes.h">
+				</File>
+				<File
+					RelativePath="..\include\Sax\ContentHandler.h">
+				</File>
+				<File
+					RelativePath="..\include\Sax\DocumentHandler.h">
+				</File>
+				<File
+					RelativePath="..\include\Sax\DTDHandler.h">
+				</File>
+				<File
+					RelativePath="..\include\Sax\EntityResolver.h">
+				</File>
+				<File
+					RelativePath="..\include\Sax\ErrorHandler.h">
+				</File>
+				<File
+					RelativePath="..\include\Sax\HandlerBase.h">
+				</File>
+				<File
+					RelativePath="..\include\Sax\InputSource.h">
+				</File>
+				<File
+					RelativePath="..\include\Sax\IStreamHandle.h">
+				</File>
+				<File
+					RelativePath="..\include\Sax\Locator.h">
+				</File>
+				<File
+					RelativePath="..\include\Sax\Parser.h">
+				</File>
+				<File
+					RelativePath="..\include\Sax\SAXException.h">
+				</File>
+				<File
+					RelativePath="..\include\Sax\saxfwd.h">
+				</File>
+				<File
+					RelativePath="..\include\Sax\SAXNotRecognizedException.h">
+				</File>
+				<File
+					RelativePath="..\include\Sax\SAXNotSupportedException.h">
+				</File>
+				<File
+					RelativePath="..\include\Sax\SAXParseException.h">
+				</File>
+				<File
+					RelativePath="..\include\Sax\XMLFilter.h">
+				</File>
+				<File
+					RelativePath="..\include\Sax\XMLReader.h">
+				</File>
+				<Filter
+					Name="ext"
+					Filter="">
+					<File
+						RelativePath="..\include\Sax\ext\Attributes2.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\ext\DeclHandler.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\ext\DefaultHandler2.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\ext\LexicalHandler.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\ext\Locator2.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\ext\ProgressiveParser.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="filter"
+					Filter="">
+					<File
+						RelativePath="..\include\Sax\filter\Writer.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="helpers"
+					Filter="">
+					<File
+						RelativePath="..\include\Sax\helpers\AttributeDefaults.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\AttributeListImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\AttributesImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\AttributeTypes.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\CatchErrorHandler.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\DefaultHandler.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\FeatureNames.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\InputSourceResolver.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\LocatorImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\NamespaceSupport.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\ParserAdaptor.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\PropertyNames.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\XMLBaseSupport.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\XMLFilterImpl.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="parsers"
+					Filter="">
+					<File
+						RelativePath="..\include\Sax\parsers\saxgarden.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="wrappers"
+					Filter="">
+					<File
+						RelativePath="..\include\Sax\wrappers\saxexpat.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\wrappers\saxlibxml2.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\wrappers\saxmsxml2.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\wrappers\saxxerces.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\wrappers\XercesFeatureNames.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\wrappers\XercesPropertyNames.h">
+					</File>
+				</Filter>
+			</Filter>
 		</Filter>
 		<Filter
-			Name="Helpers"
+			Name="src"
 			Filter="">
+			<File
+				RelativePath="ArabicaConfig.S">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="cl /TC /EP  ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.h
+"
+						Outputs="ArabicaConfig.h"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="cl /TC /EP ArabicaConfig.S &gt; ArabicaConfig.h
+"
+						Outputs="ArabicaConfig.h"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\ParserConfig.S">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="cl /TC /D USE_MSXML /EP ParserConfig.S &gt; ..\include\SAX\ParserConfig.h
+cl /TC /D USE_MSXML /EP saxlib.S &gt; saxlib.cpp
+"
+						Outputs="ParserConfig.h;saxlib.cpp"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="cl /TC /D USE_LIBXML2 /EP ParserConfig.S &gt; ParserConfig.h
+cl /TC /D USE_LIBXML2 /EP saxlib.S &gt; saxlib.cpp
+"
+						Outputs="ParserConfig.h;saxlib.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\saxlib.cpp">
+			</File>
+			<File
+				RelativePath=".\saxlib.S">
+			</File>
 			<Filter
-				Name="Source"
-				Filter="*.cpp">
+				Name="Helpers"
+				Filter="">
 				<File
 					RelativePath=".\helpers\InputSourceResolver.cpp">
 				</File>
 			</Filter>
-			<Filter
-				Name="Headers"
-				Filter="*.h">
-				<File
-					RelativePath=".\helpers\AttributeDefaults.h">
-				</File>
-				<File
-					RelativePath=".\helpers\AttributeListImpl.h">
-				</File>
-				<File
-					RelativePath=".\helpers\AttributesImpl.h">
-				</File>
-				<File
-					RelativePath=".\helpers\AttributeTypes.h">
-				</File>
-				<File
-					RelativePath="helpers\CatchErrorHandler.h">
-				</File>
-				<File
-					RelativePath=".\helpers\DefaultHandler.h">
-				</File>
-				<File
-					RelativePath=".\helpers\FeatureNames.h">
-				</File>
-				<File
-					RelativePath=".\helpers\InputSourceResolver.h">
-				</File>
-				<File
-					RelativePath=".\helpers\LocatorImpl.h">
-				</File>
-				<File
-					RelativePath=".\helpers\NamespaceSupport.h">
-				</File>
-				<File
-					RelativePath=".\helpers\ParserAdaptor.h">
-				</File>
-				<File
-					RelativePath=".\helpers\PropertyNames.h">
-				</File>
-				<File
-					RelativePath=".\helpers\XMLBaseSupport.h">
-				</File>
-				<File
-					RelativePath=".\helpers\XMLFilterImpl.h">
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="ext"
-			Filter="">
-			<File
-				RelativePath=".\ext\Attributes2.h">
-			</File>
-			<File
-				RelativePath=".\ext\DeclHandler.h">
-			</File>
-			<File
-				RelativePath=".\ext\DefaultHandler2.h">
-			</File>
-			<File
-				RelativePath=".\ext\LexicalHandler.h">
-			</File>
-			<File
-				RelativePath=".\ext\Locator2.h">
-			</File>
-			<File
-				RelativePath="ext\ProgressiveParser.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Wrappers"
-			Filter="">
-			<File
-				RelativePath=".\wrappers\saxexpat.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\wrappers\saxexpat.h">
-			</File>
-			<File
-				RelativePath=".\wrappers\saxlibxml2.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\wrappers\saxlibxml2.h">
-			</File>
-			<File
-				RelativePath=".\wrappers\saxmsxml2.h">
-			</File>
-			<File
-				RelativePath="wrappers\saxxerces.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\wrappers\saxxerces.h">
-			</File>
-			<File
-				RelativePath="wrappers\XercesFeatureNames.h">
-			</File>
-			<File
-				RelativePath="wrappers\XercesPropertyNames.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Filters"
-			Filter="">
-			<File
-				RelativePath=".\filter\Writer.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Parsers"
-			Filter="">
-			<File
-				RelativePath=".\parsers\saxgarden.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Utils"
-			Filter="">
-			<File
-				RelativePath="..\Utils\base64codecvt.cpp">
-			</File>
-			<File
-				RelativePath="..\Utils\base64codecvt.h">
-			</File>
-			<File
-				RelativePath="..\Utils\convert_adaptor.h">
-			</File>
-			<File
-				RelativePath="..\Utils\convertstream.h">
-			</File>
-			<File
-				RelativePath="..\Xml\escaper.hpp">
-			</File>
-			<File
-				RelativePath="..\Utils\getparam.hpp">
-			</File>
-			<File
-				RelativePath="..\Utils\iso88591utf8codecvt.cpp">
-			</File>
-			<File
-				RelativePath="..\Utils\iso88591utf8codecvt.h">
-			</File>
-			<File
-				RelativePath="..\Utils\rot13codecvt.cpp">
-			</File>
-			<File
-				RelativePath="..\Utils\rot13codecvt.h">
-			</File>
-			<File
-				RelativePath="..\Utils\socket_stream.h">
-			</File>
-			<File
-				RelativePath="..\Utils\StringAdaptor.h">
-			</File>
-			<File
-				RelativePath="..\Utils\stringadaptortag.hpp">
-			</File>
-			<File
-				RelativePath="..\Utils\ucs2utf8codecvt.cpp">
-			</File>
-			<File
-				RelativePath="..\Utils\ucs2utf8codecvt.hpp">
-			</File>
-			<File
-				RelativePath="..\XML\UnicodeCharacters.h">
-			</File>
-			<File
-				RelativePath="..\Utils\utf16beucs2codecvt.cpp">
-			</File>
-			<File
-				RelativePath="..\Utils\utf16beucs2codecvt.h">
-			</File>
-			<File
-				RelativePath="..\Utils\utf16leucs2codecvt.cpp">
-			</File>
-			<File
-				RelativePath="..\Utils\utf16leucs2codecvt.h">
-			</File>
-			<File
-				RelativePath="..\Utils\utf16utf8codecvt.cpp">
-			</File>
-			<File
-				RelativePath="..\Utils\utf16utf8codecvt.h">
-			</File>
-			<File
-				RelativePath="..\Utils\utf8iso88591codecvt.cpp">
-			</File>
-			<File
-				RelativePath="..\Utils\utf8iso88591codecvt.h">
-			</File>
-			<File
-				RelativePath="..\Utils\utf8ucs2codecvt.cpp">
-			</File>
-			<File
-				RelativePath="..\Utils\utf8ucs2codecvt.h">
-			</File>
-			<File
-				RelativePath="..\XML\XMLCharacterClasses.cpp">
-			</File>
-			<File
-				RelativePath="..\XML\XMLCharacterClasses.h">
-			</File>
-			<Filter
-				Name="impl"
-				Filter="">
-				<File
-					RelativePath="..\Utils\impl\codecvt_specialisations.h">
-				</File>
-				<File
-					RelativePath="..\Utils\impl\iso88591_utf8.cpp">
-				</File>
-				<File
-					RelativePath="..\Utils\impl\iso88591_utf8.h">
-				</File>
-				<File
-					RelativePath="..\Utils\impl\ucs2_utf16.cpp">
-				</File>
-				<File
-					RelativePath="..\Utils\impl\ucs2_utf16.h">
-				</File>
-				<File
-					RelativePath="..\Utils\impl\ucs2_utf8.cpp">
-				</File>
-				<File
-					RelativePath="..\Utils\impl\ucs2_utf8.h">
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="XPath"
-			Filter="">
-			<File
-				RelativePath="..\XPath\XPath.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_arithmetic.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_ast.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_ast_ids.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_axis_enumerator.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_compile_context.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_execution_context.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_expression.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_function.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_function_holder.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_function_resolver.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_grammar.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_logical.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_namespace_context.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_namespace_node.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_node_test.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_object.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_parser.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_relational.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_resolver_holder.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_step.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_union.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_value.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_variable.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\impl\xpath_variable_resolver.hpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="DOM"
-			Filter="">
-			<File
-				RelativePath="..\Dom\Attr.h">
-			</File>
-			<File
-				RelativePath="..\Dom\CDATASection.h">
-			</File>
-			<File
-				RelativePath="..\Dom\CharacterData.h">
-			</File>
-			<File
-				RelativePath="..\Dom\Comment.h">
-			</File>
-			<File
-				RelativePath="..\Dom\Document.h">
-			</File>
-			<File
-				RelativePath="..\Dom\DocumentFragment.h">
-			</File>
-			<File
-				RelativePath="..\Dom\DocumentType.h">
-			</File>
-			<File
-				RelativePath="..\Dom\DOMException.h">
-			</File>
-			<File
-				RelativePath="..\Dom\DOMImplementation.h">
-			</File>
-			<File
-				RelativePath="..\Dom\Element.h">
-			</File>
-			<File
-				RelativePath="..\Dom\Entity.h">
-			</File>
-			<File
-				RelativePath="..\Dom\EntityReference.h">
-			</File>
-			<File
-				RelativePath="..\Dom\NamedNodeMap.h">
-			</File>
-			<File
-				RelativePath="..\Dom\Node.h">
-			</File>
-			<File
-				RelativePath="..\Dom\NodeList.h">
-			</File>
-			<File
-				RelativePath="..\Dom\Notation.h">
-			</File>
-			<File
-				RelativePath="..\Dom\ProcessingInstruction.h">
-			</File>
-			<File
-				RelativePath="..\Dom\Proxy.h">
-			</File>
-			<File
-				RelativePath="..\Dom\Text.h">
-			</File>
 			<Filter
 				Name="Utils"
 				Filter="">
 				<File
-					RelativePath="..\Dom\Utils\Stream.h">
+					RelativePath="..\Utils\base64codecvt.cpp">
 				</File>
+				<File
+					RelativePath="..\Utils\iso88591utf8codecvt.cpp">
+				</File>
+				<File
+					RelativePath="..\Utils\rot13codecvt.cpp">
+				</File>
+				<File
+					RelativePath="..\Utils\ucs2utf8codecvt.cpp">
+				</File>
+				<File
+					RelativePath="..\Utils\utf16beucs2codecvt.cpp">
+				</File>
+				<File
+					RelativePath="..\Utils\utf16leucs2codecvt.cpp">
+				</File>
+				<File
+					RelativePath="..\Utils\utf16utf8codecvt.cpp">
+				</File>
+				<File
+					RelativePath="..\Utils\utf8iso88591codecvt.cpp">
+				</File>
+				<File
+					RelativePath="..\Utils\utf8ucs2codecvt.cpp">
+				</File>
+				<File
+					RelativePath="..\XML\XMLCharacterClasses.cpp">
+				</File>
+				<Filter
+					Name="impl"
+					Filter="">
+					<File
+						RelativePath="..\Utils\impl\iso88591_utf8.cpp">
+					</File>
+					<File
+						RelativePath="..\Utils\impl\ucs2_utf16.cpp">
+					</File>
+					<File
+						RelativePath="..\Utils\impl\ucs2_utf8.cpp">
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
-				Name="Events"
+				Name="SAX"
 				Filter="">
-				<File
-					RelativePath="..\Dom\Events\DocumentEvent.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Events\Event.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Events\EventException.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Events\EventListener.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Events\EventTarget.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Events\MutationEvent.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="Simple"
-				Filter="">
-				<File
-					RelativePath="..\Dom\Simple\AttrImpl.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\AttrMap.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\AttrNSImpl.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\CDATASectionImpl.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\CharacterDataImpl.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\CommentImpl.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\DocumentFragmentImpl.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\DocumentImpl.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\DocumentTypeImpl.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\DOMImplementation.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\ElementByTagImpl.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\ElementImpl.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\ElementNSImpl.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\EntityImpl.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\EntityReferenceImpl.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\Helpers.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\NamedNodeMapImpl.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\NodeImpl.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\NotationImpl.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\ProcessingInstructionImpl.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Simple\TextImpl.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="Traversal"
-				Filter="">
-				<File
-					RelativePath="..\Dom\Traversal\DocumentTraversal.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Traversal\NodeFilter.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Traversal\NodeIterator.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Traversal\TreeWalker.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="SAX2DOM"
-				Filter="">
-				<File
-					RelativePath="..\Dom\Sax2dom\DocumentTypeImpl.h">
-				</File>
-				<File
-					RelativePath="..\Dom\Sax2dom\SAX2DOM.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="DualMode"
-				Filter="">
-				<File
-					RelativePath="..\Dom\DualMode\DualMode.hpp">
-				</File>
+				<Filter
+					Name="Wrappers"
+					Filter="">
+					<File
+						RelativePath=".\wrappers\saxexpat.cpp">
+						<FileConfiguration
+							Name="Debug|Win32"
+							ExcludedFromBuild="TRUE">
+							<Tool
+								Name="VCCLCompilerTool"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							ExcludedFromBuild="TRUE">
+							<Tool
+								Name="VCCLCompilerTool"/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath=".\wrappers\saxlibxml2.cpp">
+						<FileConfiguration
+							Name="Debug|Win32"
+							ExcludedFromBuild="TRUE">
+							<Tool
+								Name="VCCLCompilerTool"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							ExcludedFromBuild="TRUE">
+							<Tool
+								Name="VCCLCompilerTool"/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="wrappers\saxxerces.cpp">
+						<FileConfiguration
+							Name="Debug|Win32"
+							ExcludedFromBuild="TRUE">
+							<Tool
+								Name="VCCLCompilerTool"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							ExcludedFromBuild="TRUE">
+							<Tool
+								Name="VCCLCompilerTool"/>
+						</FileConfiguration>
+					</File>
+				</Filter>
 			</Filter>
 		</Filter>
-		<File
-			RelativePath="ArabicaConfig.S">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					CommandLine="cl /TC /EP  ArabicaConfig.S &gt; ArabicaConfig.h
-"
-					Outputs="ArabicaConfig.h"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					CommandLine="cl /TC /EP ArabicaConfig.S &gt; ArabicaConfig.h
-"
-					Outputs="ArabicaConfig.h"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\ParserConfig.S">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					CommandLine="cl /TC /D USE_MSXML /EP ParserConfig.S &gt; ParserConfig.h
-cl /TC /D USE_MSXML /EP saxlib.S &gt; saxlib.cpp
-"
-					Outputs="ParserConfig.h;saxlib.cpp"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					CommandLine="cl /TC /D USE_LIBXML2 /EP ParserConfig.S &gt; ParserConfig.h
-cl /TC /D USE_LIBXML2 /EP saxlib.S &gt; saxlib.cpp
-"
-					Outputs="ParserConfig.h;saxlib.cpp"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\saxlib.cpp">
-		</File>
-		<File
-			RelativePath=".\saxlib.S">
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/examples/SAX/SimpleHandler.vcproj b/examples/SAX/SimpleHandler.vcproj
index f87bae0a..1eb07256 100644
--- a/examples/SAX/SimpleHandler.vcproj
+++ b/examples/SAX/SimpleHandler.vcproj
@@ -23,7 +23,7 @@
 				AdditionalOptions="/Zm200
 "
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -86,7 +86,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
diff --git a/examples/SAX/Writer.vcproj b/examples/SAX/Writer.vcproj
index 1a5c5938..3c2b3958 100644
--- a/examples/SAX/Writer.vcproj
+++ b/examples/SAX/Writer.vcproj
@@ -23,7 +23,7 @@
 				AdditionalOptions="/Zm200
 "
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -85,7 +85,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\;..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
diff --git a/examples/SAX/example_XMLBase.vcproj b/examples/SAX/example_XMLBase.vcproj
index 4d051204..3f755b48 100644
--- a/examples/SAX/example_XMLBase.vcproj
+++ b/examples/SAX/example_XMLBase.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -69,7 +69,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="TRUE"
diff --git a/examples/SAX/pyx.vcproj b/examples/SAX/pyx.vcproj
index e0826440..c8dba4c0 100644
--- a/examples/SAX/pyx.vcproj
+++ b/examples/SAX/pyx.vcproj
@@ -23,7 +23,7 @@
 				AdditionalOptions="/Zm200
 "
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -86,7 +86,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
diff --git a/examples/SAX2DOM/DOMWriter.vcproj b/examples/SAX2DOM/DOMWriter.vcproj
index b76f6b2c..e20d8e46 100644
--- a/examples/SAX2DOM/DOMWriter.vcproj
+++ b/examples/SAX2DOM/DOMWriter.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="FALSE"
 				BasicRuntimeChecks="3"
@@ -75,7 +75,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
diff --git a/examples/Utils/transcode.vcproj b/examples/Utils/transcode.vcproj
index a2a90fe8..fff56ae7 100644
--- a/examples/Utils/transcode.vcproj
+++ b/examples/Utils/transcode.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -72,7 +72,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
diff --git a/examples/XPath/xgrep.vcproj b/examples/XPath/xgrep.vcproj
index d969d98f..b9cc5682 100644
--- a/examples/XPath/xgrep.vcproj
+++ b/examples/XPath/xgrep.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -70,7 +70,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="TRUE"
diff --git a/test/DOM/DOM_test.vcproj b/test/DOM/DOM_test.vcproj
index fd2dc65f..be57f156 100644
--- a/test/DOM/DOM_test.vcproj
+++ b/test/DOM/DOM_test.vcproj
@@ -23,7 +23,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm200"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -86,7 +86,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
diff --git a/test/DOM_silly/DOM_test_silly.vcproj b/test/DOM_silly/DOM_test_silly.vcproj
index ceec16df..4c4d48b4 100644
--- a/test/DOM_silly/DOM_test_silly.vcproj
+++ b/test/DOM_silly/DOM_test_silly.vcproj
@@ -23,7 +23,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm200"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -86,7 +86,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
diff --git a/test/DOM_wide/DOM_test_wide.vcproj b/test/DOM_wide/DOM_test_wide.vcproj
index aa5ccbd2..388c7abb 100644
--- a/test/DOM_wide/DOM_test_wide.vcproj
+++ b/test/DOM_wide/DOM_test_wide.vcproj
@@ -23,7 +23,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm200"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -86,7 +86,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
diff --git a/test/SAX/FilterTest.vcproj b/test/SAX/FilterTest.vcproj
index a3ba5682..0741702d 100644
--- a/test/SAX/FilterTest.vcproj
+++ b/test/SAX/FilterTest.vcproj
@@ -24,7 +24,7 @@
 				AdditionalOptions="/Zm200
 "
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -86,7 +86,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\;..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
diff --git a/test/SAX2DOM/SAX2DOM_test.vcproj b/test/SAX2DOM/SAX2DOM_test.vcproj
index 46dabd34..60120cd6 100644
--- a/test/SAX2DOM/SAX2DOM_test.vcproj
+++ b/test/SAX2DOM/SAX2DOM_test.vcproj
@@ -23,7 +23,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm200"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -86,7 +86,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
diff --git a/test/XPath/xpathic.vcproj b/test/XPath/xpathic.vcproj
index 13f2ebdf..87a9a3f4 100644
--- a/test/XPath/xpathic.vcproj
+++ b/test/XPath/xpathic.vcproj
@@ -21,7 +21,7 @@
 				AdditionalOptions="/Zm1000 "
 				Optimization="0"
 				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="FALSE"
 				BasicRuntimeChecks="0"
@@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm1000 "
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				DisableLanguageExtensions="TRUE"
diff --git a/test/XPath_silly/xpathic_silly.vcproj b/test/XPath_silly/xpathic_silly.vcproj
index bee4d691..be1cff50 100644
--- a/test/XPath_silly/xpathic_silly.vcproj
+++ b/test/XPath_silly/xpathic_silly.vcproj
@@ -21,7 +21,7 @@
 				AdditionalOptions="/Zm1000 "
 				Optimization="0"
 				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="FALSE"
 				BasicRuntimeChecks="0"
@@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm1000 "
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				DisableLanguageExtensions="TRUE"
diff --git a/test/XPath_wide/xpathic_wide.vcproj b/test/XPath_wide/xpathic_wide.vcproj
index 2b7cce29..11a97e14 100644
--- a/test/XPath_wide/xpathic_wide.vcproj
+++ b/test/XPath_wide/xpathic_wide.vcproj
@@ -21,7 +21,7 @@
 				AdditionalOptions="/Zm1000 "
 				Optimization="0"
 				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="FALSE"
 				BasicRuntimeChecks="0"
@@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm1000 "
-				AdditionalIncludeDirectories="..\..\"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				DisableLanguageExtensions="TRUE"