diff --git a/.bzrignore b/.bzrignore
index 139ad20a..a05a9f4d 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -17,3 +17,16 @@ tests/XSLT/test_path.hpp
 *.la
 .libs
 config.cache
+vs9\*.user
+*.ncb
+*.suo
+*/Debug*
+*/Release*
+*.ilk
+*.pdb
+*.exp
+*.lib
+*.bsc
+lib
+arabica-2008-july
+arabica-2008-july.*
diff --git a/include/Arabica/getparam.hpp b/include/Arabica/getparam.hpp
index 7ba6bd44..fdef0ec3 100644
--- a/include/Arabica/getparam.hpp
+++ b/include/Arabica/getparam.hpp
@@ -39,6 +39,15 @@ struct get_param
 };
 #endif
 
+template <typename string_type, typename T0, typename T1>
+struct get_string_adaptor
+{
+  typedef typename get_param<Arabica::string_adaptor_tag, 
+                             Arabica::default_string_adaptor<string_type>, 
+                             T0, 
+                             T1>::type type;
+};
+
 } // namespace Arabica
 
 #endif
diff --git a/include/SAX/ParserConfig.hpp b/include/SAX/ParserConfig.hpp
index 55dc4405..69034088 100644
--- a/include/SAX/ParserConfig.hpp
+++ b/include/SAX/ParserConfig.hpp
@@ -69,15 +69,7 @@ namespace Arabica
 {
 namespace SAX
 {
-#ifdef HAVE_BOOST
-  template<class string_type, class T0 = Arabica::nil_t, class T1 = Arabica::nil_t>
-#else
-#ifndef USE_MSXML
-  template<class string_type, class T0 = Arabica::nil_t, class T1 = Arabica::nil_t>
-#else
-  template<class string_type, class T0 = Arabica::default_string_adaptor<string_type>, class T1 = SAX::COMSingleThreadInitializer>
-#endif
-#endif
+template<class string_type, class T0 = Arabica::nil_t, class T1 = Arabica::nil_t>
   class XMLReader : public DEF_SAX_P<string_type, T0, T1> { };
 } // namespace SAX
 } // namespace Arabica
diff --git a/include/SAX/XMLFilter.hpp b/include/SAX/XMLFilter.hpp
index aeb275be..ea5f1273 100644
--- a/include/SAX/XMLFilter.hpp
+++ b/include/SAX/XMLFilter.hpp
@@ -2,7 +2,6 @@
 #define ARABICA_XML_FILTER_H
 
 // XMLFilter.h
-// $Id$
 
 #include <string>
 #include <SAX/ArabicaConfig.hpp>
@@ -34,15 +33,12 @@ namespace SAX
   * @version 2.0
   * @see XMLFilterImpl
   */
-template<class string_type, class T0 = Arabica::nil_t, class T1 = Arabica::nil_t>
-class XMLFilter : public XMLReaderInterface<string_type, T0, T1>
+template<class string_type, class string_adaptor_type>
+class XMLFilter : public XMLReaderInterface<string_type, string_adaptor_type>
 {
 public:
-  typedef typename Arabica::get_param<Arabica::string_adaptor_tag, 
-                             Arabica::default_string_adaptor<string_type>, 
-                             T0, 
-                             T1>::type string_adaptor;
-  typedef XMLReaderInterface<string_type, T0, T1> XMLReaderT;
+  typedef XMLReaderInterface<string_type, string_adaptor_type> XMLReaderT;
+  typedef typename XMLReaderT::string_adaptor string_adaptor;
 
   virtual ~XMLFilter() { }
 
diff --git a/include/SAX/XMLReader.hpp b/include/SAX/XMLReader.hpp
index 90a30438..159d096d 100644
--- a/include/SAX/XMLReader.hpp
+++ b/include/SAX/XMLReader.hpp
@@ -65,14 +65,11 @@ namespace SAX
  */
 class XMLReaderInterface_tag { };
 
-template<class string_type, class T0, class T1>
+template<class string_type, class string_adaptor_type>
 class XMLReaderInterface : public XMLReaderInterface_tag 
 {
 public:
-  typedef typename Arabica::get_param<Arabica::string_adaptor_tag, 
-                             Arabica::default_string_adaptor<string_type>, 
-                             T0, 
-                             T1>::type string_adaptor;
+  typedef string_adaptor_type string_adaptor;
   typedef EntityResolver<string_type, string_adaptor> EntityResolverT;
   typedef DTDHandler<string_type, string_adaptor> DTDHandlerT;
   typedef ContentHandler<string_type, string_adaptor> ContentHandlerT;
diff --git a/include/SAX/filter/NamespaceTracker.hpp b/include/SAX/filter/NamespaceTracker.hpp
index 96c87bc5..275f3996 100644
--- a/include/SAX/filter/NamespaceTracker.hpp
+++ b/include/SAX/filter/NamespaceTracker.hpp
@@ -12,16 +12,15 @@ namespace Arabica
 namespace SAX
 {
 
-template<class string_type, class T0 = Arabica::nil_t, class T1 = Arabica::nil_t>
-class NamespaceTracker : public XMLFilterImpl<string_type, T0, T1>
+  template<class string_type, class string_adaptor = Arabica::default_string_adaptor<string_type> >
+class NamespaceTracker : public XMLFilterImpl<string_type, string_adaptor>
 {
-  typedef XMLFilterImpl<string_type, T0, T1> XMLFilterT;
-  typedef typename XMLFilterT::string_adaptor string_adaptor;
+  typedef XMLFilterImpl<string_type, string_adaptor> XMLFilterT;
   typedef NamespaceSupport<string_type, string_adaptor> NamespaceSupportT;
   typedef typename NamespaceSupportT::stringListT stringListT;
 
 public:
-  typedef XMLReaderInterface<string_type, T0, T1> XMLReaderT;
+  typedef XMLReaderInterface<string_type, string_adaptor> XMLReaderT;
   typedef Attributes<string_type, string_adaptor> AttributesT;
 
   NamespaceTracker() : 
diff --git a/include/SAX/filter/PYXWriter.hpp b/include/SAX/filter/PYXWriter.hpp
index 96c7ec58..ab7d1f05 100644
--- a/include/SAX/filter/PYXWriter.hpp
+++ b/include/SAX/filter/PYXWriter.hpp
@@ -11,14 +11,13 @@ namespace Arabica
 namespace SAX 
 {
 
-template<class string_type, class T0 = Arabica::nil_t, class T1 = Arabica::nil_t>
-class PYXWriter : public XMLFilterImpl<string_type, T0, T1>
+template<class string_type, class string_adaptor = Arabica::default_string_adaptor<string_type> >
+class PYXWriter : public XMLFilterImpl<string_type, string_adaptor>
 {
   public:
-    typedef XMLReaderInterface<string_type, T0, T1> XMLReaderT;
-    typedef XMLFilterImpl<string_type, T0, T1> XMLFilterT;
+    typedef XMLReaderInterface<string_type, string_adaptor> XMLReaderT;
+    typedef XMLFilterImpl<string_type, string_adaptor> XMLFilterT;
     typedef typename XMLFilterT::AttributesT AttributesT;
-    typedef typename XMLFilterT::string_adaptor string_adaptor;
     typedef typename string_type::value_type charT;
     typedef typename string_type::traits_type traitsT;
     typedef std::basic_ostream<charT, traitsT> ostreamT;
@@ -54,8 +53,8 @@ class PYXWriter : public XMLFilterImpl<string_type, T0, T1>
     ostreamT* stream_;
 }; // class PYXWriter
 
-template<class string_type, class T0, class T1>
-void PYXWriter<string_type, T0, T1>::startElement(
+template<class string_type, class string_adaptor>
+void PYXWriter<string_type, string_adaptor>::startElement(
                               const string_type& namespaceURI, const string_type& localName,
                               const string_type& qName, const AttributesT& atts)
 { 
@@ -71,8 +70,8 @@ void PYXWriter<string_type, T0, T1>::startElement(
   XMLFilterT::startElement(namespaceURI, localName, qName, atts);
 } // startElement
 
-template<class string_type, class T0, class T1>
-void PYXWriter<string_type, T0, T1>::endElement(
+template<class string_type, class string_adaptor>
+void PYXWriter<string_type, string_adaptor>::endElement(
                             const string_type& namespaceURI, const string_type& localName,
                             const string_type& qName)
 {
@@ -81,8 +80,8 @@ void PYXWriter<string_type, T0, T1>::endElement(
   XMLFilterT::endElement(namespaceURI, localName, qName);
 } // endElement
 
-template<class string_type, class T0, class T1>
-void PYXWriter<string_type, T0, T1>::characters(const string_type& ch)
+template<class string_type, class string_adaptor>
+void PYXWriter<string_type, string_adaptor>::characters(const string_type& ch)
 {
   *stream_ << UnicodeT::HYPHEN_MINUS;
   escape(ch);
@@ -91,8 +90,8 @@ void PYXWriter<string_type, T0, T1>::characters(const string_type& ch)
   XMLFilterT::characters(ch);
 } // characters
 
-template<class string_type, class T0, class T1>
-void PYXWriter<string_type, T0, T1>::processingInstruction(const string_type& target, const string_type& data)
+template<class string_type, class string_adaptor>
+void PYXWriter<string_type, string_adaptor>::processingInstruction(const string_type& target, const string_type& data)
 {
   *stream_ << UnicodeT::QUESTION_MARK << target
            << UnicodeT::SPACE << data
@@ -101,8 +100,8 @@ void PYXWriter<string_type, T0, T1>::processingInstruction(const string_type& ta
   XMLFilterT::processingInstruction(target, data);
 } // processingInstruction
 
-template<class string_type, class T0, class T1>
-void PYXWriter<string_type, T0, T1>::escape(const string_type& ch)
+template<class string_type, class string_adaptor>
+void PYXWriter<string_type, string_adaptor>::escape(const string_type& ch)
 {
   for(typename string_type::const_iterator s = ch.begin(), se = ch.end(); s != se; ++s)
     if(*s == UnicodeT::LINE_FEED)
diff --git a/include/SAX/filter/TextCoalescer.hpp b/include/SAX/filter/TextCoalescer.hpp
index a6846e43..9639071f 100644
--- a/include/SAX/filter/TextCoalescer.hpp
+++ b/include/SAX/filter/TextCoalescer.hpp
@@ -16,14 +16,12 @@ namespace SAX
   an issue, and sometimes it makes things a little awkward.  
   This filter buffers up multiple calls to characters(...) and reports text in a single lump.
  */
-template<class string_type, class T0 = Arabica::nil_t, class T1 = Arabica::nil_t>
-class TextCoalescer : public XMLFilterImpl<string_type, T0, T1>
+template<class string_type, class string_adaptor=Arabica::default_string_adaptor<string_type> >
+class TextCoalescer : public XMLFilterImpl<string_type, string_adaptor>
 {
-  typedef XMLFilterImpl<string_type, T0, T1> XMLFilterT;
-  typedef typename XMLFilterT::string_adaptor string_adaptor;
-
+  typedef XMLFilterImpl<string_type, string_adaptor> XMLFilterT;
 public:
-  typedef XMLReaderInterface<string_type, T0, T1> XMLReaderT;
+  typedef XMLReaderInterface<string_type, string_adaptor> XMLReaderT;
   typedef Attributes<string_type, string_adaptor> AttributesT;
 
   TextCoalescer() : 
diff --git a/include/SAX/filter/TextOnly.hpp b/include/SAX/filter/TextOnly.hpp
index 7bfea8f4..a4714668 100644
--- a/include/SAX/filter/TextOnly.hpp
+++ b/include/SAX/filter/TextOnly.hpp
@@ -13,7 +13,7 @@ namespace SAX
 /**
   Strips out everything except startDocument, endDocument and text
  */
-template<class string_type, class T0 = Arabica::nil_t, class T1 = Arabica::nil_t>
+template<class string_type, class string_adaptor=Arabica::default_string_adaptor<string_type> >
 class TextOnly : public XMLFilterImpl<string_type, string_adaptor>
 {
   typedef XMLFilterImpl<string_type, string_adaptor> XMLFilterT;
diff --git a/include/SAX/filter/WhitespaceStripperFilter.hpp b/include/SAX/filter/WhitespaceStripperFilter.hpp
index 7d834abe..3f942db2 100644
--- a/include/SAX/filter/WhitespaceStripperFilter.hpp
+++ b/include/SAX/filter/WhitespaceStripperFilter.hpp
@@ -10,13 +10,12 @@ namespace Arabica
 namespace SAX
 {
 
-template<class string_type, class T0 = Arabica::nil_t, class T1 = Arabica::nil_t>
-class WhitespaceStripper : public SAX::XMLFilterImpl<string_type, T0, T1>
+template<class string_type, class string_adaptor = Arabica::default_string_adaptor<string_type> >
+class WhitespaceStripper : public SAX::XMLFilterImpl<string_type, string_adaptor>
 {
   public:
-    typedef SAX::XMLReader<string_type, T0, T1> XMLReaderT;
-    typedef SAX::XMLFilterImpl<string_type, T0, T1> XMLFilterT;
-    typedef typename XMLFilterT::string_adaptor string_adaptor;
+    typedef SAX::XMLReaderInterface<string_type, string_adaptor> XMLReaderT;
+    typedef SAX::XMLFilterImpl<string_type, string_adaptor> XMLFilterT;
 
     WhitespaceStripper() : 
       XMLFilterT() 
diff --git a/include/SAX/filter/Writer.hpp b/include/SAX/filter/Writer.hpp
index 50737f70..a4107316 100644
--- a/include/SAX/filter/Writer.hpp
+++ b/include/SAX/filter/Writer.hpp
@@ -19,21 +19,17 @@ namespace Arabica
 namespace SAX 
 {
 
-template<class string_type, class T0 = Arabica::nil_t, class T1 = Arabica::nil_t>
-class Writer : public XMLFilterImpl<string_type, T0, T1>
+template<class string_type, class string_adaptor = Arabica::default_string_adaptor<string_type> >
+class Writer : public XMLFilterImpl<string_type, string_adaptor>
 {
   public:
-  typedef typename Arabica::get_param<Arabica::string_adaptor_tag, 
-                             Arabica::default_string_adaptor<string_type>, 
-                             T0, 
-                             T1>::type string_adaptor;
-    typedef Writer<string_type, T0, T1> WriterT;
+    typedef Writer<string_type, string_adaptor> WriterT;
     typedef typename string_type::value_type charT;
     typedef typename string_type::traits_type traitsT;
     typedef std::basic_ostream<charT, traitsT> ostreamT;
-    typedef XMLReaderInterface<string_type, T0, T1> XMLReaderT;
-    typedef XMLFilterImpl<string_type, T0, T1> XMLFilterT;
-    typedef typename XMLFilterImpl<string_type, T0, T1>::AttributesT AttributesT;
+    typedef XMLReaderInterface<string_type, string_adaptor> XMLReaderT;
+    typedef XMLFilterImpl<string_type, string_adaptor> XMLFilterT;
+    typedef typename XMLFilterImpl<string_type, string_adaptor>::AttributesT AttributesT;
     typedef Arabica::text::Unicode<charT> UnicodeT;
     typedef Arabica::XML::text_escaper<charT, traitsT> text_escaperT;
     typedef Arabica::XML::attribute_escaper<charT, traitsT> attribute_escaperT;
@@ -156,8 +152,8 @@ class Writer : public XMLFilterImpl<string_type, T0, T1>
 
 }; // class Writer
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::startDocument()
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::startDocument()
 {
   *stream_ << UnicodeT::LESS_THAN_SIGN
            << UnicodeT::QUESTION_MARK
@@ -206,15 +202,15 @@ void Writer<string_type, T0, T1>::startDocument()
   lastTag_ = docTag;
 } // startDocument
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::endDocument()
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::endDocument()
 {
   XMLFilterT::endDocument();
   lastTag_ = endTag;
 } // endDocument
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::startElement(
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::startElement(
                               const string_type& namespaceURI, const string_type& localName,
                               const string_type& qName, const AttributesT& atts)
 { 
@@ -241,8 +237,8 @@ void Writer<string_type, T0, T1>::startElement(
   XMLFilterT::startElement(namespaceURI, localName, qName, atts);
 } // startElement
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::endElement(
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::endElement(
                             const string_type& namespaceURI, const string_type& localName,
                             const string_type& qName)
 {
@@ -260,8 +256,8 @@ void Writer<string_type, T0, T1>::endElement(
   XMLFilterT::endElement(namespaceURI, localName, qName);
 } // endElement
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::characters(const string_type& ch)
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::characters(const string_type& ch)
 {
   if(!inCDATA_)
     std::for_each(ch.begin(), ch.end(), text_escaperT(*stream_));
@@ -271,16 +267,16 @@ void Writer<string_type, T0, T1>::characters(const string_type& ch)
   XMLFilterT::characters(ch);
 } // characters
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::ignorableWhitespace(const string_type& ch)
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::ignorableWhitespace(const string_type& ch)
 {
   *stream_ << ch;
 
   XMLFilterT::ignorableWhitespace(ch);
 } // ignorableWhitespace
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::processingInstruction(const string_type& target, const string_type& data)
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::processingInstruction(const string_type& target, const string_type& data)
 {
   if((!inDTD_) || (inDTD_ && internalSubset_))
   {
@@ -298,8 +294,8 @@ void Writer<string_type, T0, T1>::processingInstruction(const string_type& targe
   XMLFilterT::processingInstruction(target, data);
 } // processingInstruction
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::skippedEntity(const string_type& name)
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::skippedEntity(const string_type& name)
 {
   if(!isDtd(name))
     *stream_ << UnicodeT::AMPERSAND << name << UnicodeT::SEMI_COLON;
@@ -307,15 +303,15 @@ void Writer<string_type, T0, T1>::skippedEntity(const string_type& name)
   XMLFilterT::skippedEntity(name);
 } // skippedEntity
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::doIndent()
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::doIndent()
 {
   for(int i = 0; i < depth_; ++i)
     *stream_ << UnicodeT::SPACE;
 } // doIndent
 
-template<class string_type, class T0, class T1>
-bool Writer<string_type, T0, T1>::isDtd(const string_type& name)
+template<class string_type, class string_adaptor>
+bool Writer<string_type, string_adaptor>::isDtd(const string_type& name)
 {
   return (name.length() == 5 && 
      name[0] == UnicodeT::LEFT_SQUARE_BRACKET &&
@@ -325,8 +321,8 @@ bool Writer<string_type, T0, T1>::isDtd(const string_type& name)
      name[4] == UnicodeT::RIGHT_SQUARE_BRACKET);
 } // isDtd
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::startDTD(const string_type& name, const string_type& publicId, const string_type& systemId)
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::startDTD(const string_type& name, const string_type& publicId, const string_type& systemId)
 {
   inDTD_ = true;
   depth_ += indent_;
@@ -352,8 +348,8 @@ void Writer<string_type, T0, T1>::startDTD(const string_type& name, const string
   XMLFilterT::startDTD(name, publicId, systemId);
 } // startDTD
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::endDTD()
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::endDTD()
 {
   *stream_ << UnicodeT::RIGHT_SQUARE_BRACKET
            << UnicodeT::GREATER_THAN_SIGN
@@ -365,8 +361,8 @@ void Writer<string_type, T0, T1>::endDTD()
   XMLFilterT::endDTD();
 } // endDTD
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::startEntity(const string_type& name)
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::startEntity(const string_type& name)
 {
   if(isDtd(name))
     internalSubset_ = false;
@@ -374,8 +370,8 @@ void Writer<string_type, T0, T1>::startEntity(const string_type& name)
   XMLFilterT::startEntity(name);
 } // startEntity
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::endEntity(const string_type& name)
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::endEntity(const string_type& name)
 {
   if(isDtd(name))
     internalSubset_ = true;
@@ -383,8 +379,8 @@ void Writer<string_type, T0, T1>::endEntity(const string_type& name)
   XMLFilterT::endEntity(name);
 } // endEntity
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::startCDATA()
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::startCDATA()
 {
   inCDATA_ = true;
 
@@ -401,8 +397,8 @@ void Writer<string_type, T0, T1>::startCDATA()
   XMLFilterT::startCDATA();
 } // startCDATA
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::endCDATA()
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::endCDATA()
 {
   *stream_ << UnicodeT::RIGHT_SQUARE_BRACKET
            << UnicodeT::RIGHT_SQUARE_BRACKET
@@ -413,8 +409,8 @@ void Writer<string_type, T0, T1>::endCDATA()
   XMLFilterT::endCDATA();
 } // endCDATA
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::comment(const string_type& text)
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::comment(const string_type& text)
 {
   if((!inDTD_) || (inDTD_ && internalSubset_))
     *stream_ << UnicodeT::LESS_THAN_SIGN
@@ -429,8 +425,8 @@ void Writer<string_type, T0, T1>::comment(const string_type& text)
   XMLFilterT::comment(text);
 } // comment
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::notationDecl(const string_type& name, const string_type& publicId, const string_type& systemId)
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::notationDecl(const string_type& name, const string_type& publicId, const string_type& systemId)
 {
   if(inDTD_ && internalSubset_)
   {
@@ -458,8 +454,8 @@ void Writer<string_type, T0, T1>::notationDecl(const string_type& name, const st
   XMLFilterT::notationDecl(name, publicId, systemId);
 } // notationDecl
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::unparsedEntityDecl(const string_type& name, const string_type& publicId, const string_type& systemId, const string_type& notationName)
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::unparsedEntityDecl(const string_type& name, const string_type& publicId, const string_type& systemId, const string_type& notationName)
 {
   if(inDTD_ && internalSubset_)
   {
@@ -483,8 +479,8 @@ void Writer<string_type, T0, T1>::unparsedEntityDecl(const string_type& name, co
   XMLFilterT::unparsedEntityDecl(name, publicId, systemId, notationName);
 } // unparsedEntityDecl
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::elementDecl(const string_type& name, const string_type& model)
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::elementDecl(const string_type& name, const string_type& model)
 {
   if(inDTD_ && internalSubset_)
   {
@@ -511,8 +507,8 @@ void Writer<string_type, T0, T1>::elementDecl(const string_type& name, const str
   XMLFilterT::elementDecl(name, model);
 } // elementDecl
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::attributeDecl(const string_type& elementName, const string_type& attributeName,
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::attributeDecl(const string_type& elementName, const string_type& attributeName,
                                const string_type& type, const string_type& valueDefault, const string_type& value)
 {
   if(inDTD_ && internalSubset_)
@@ -552,8 +548,8 @@ void Writer<string_type, T0, T1>::attributeDecl(const string_type& elementName,
   XMLFilterT::attributeDecl(elementName, attributeName, type, valueDefault, value);
 } // attributeDecl
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::internalEntityDecl(const string_type& name, const string_type& value)
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::internalEntityDecl(const string_type& name, const string_type& value)
 {
   if(inDTD_ && internalSubset_)
   {
@@ -570,8 +566,8 @@ void Writer<string_type, T0, T1>::internalEntityDecl(const string_type& name, co
   XMLFilterT::internalEntityDecl(name, value);
 } // internalEntityDecl
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::externalEntityDecl(const string_type& name, const string_type& publicId, const string_type& systemId)
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::externalEntityDecl(const string_type& name, const string_type& publicId, const string_type& systemId)
 {
   if(inDTD_ && internalSubset_)
   {
@@ -585,8 +581,8 @@ void Writer<string_type, T0, T1>::externalEntityDecl(const string_type& name, co
   XMLFilterT::externalEntityDecl(name, publicId, systemId);
 } // externalEntityDecl
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::startEntityDecl(const string_type& name)
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::startEntityDecl(const string_type& name)
 {
   *stream_ << UnicodeT::LESS_THAN_SIGN
            << UnicodeT::EXCLAMATION_MARK
@@ -600,8 +596,8 @@ void Writer<string_type, T0, T1>::startEntityDecl(const string_type& name)
            << name;
 } // startEntityDecl
 
-template<class string_type, class T0, class T1>
-void Writer<string_type, T0, T1>::publicAndSystem(const string_type& publicId, const string_type& systemId)
+template<class string_type, class string_adaptor>
+void Writer<string_type, string_adaptor>::publicAndSystem(const string_type& publicId, const string_type& systemId)
 {
   *stream_ << UnicodeT::SPACE;
 
diff --git a/include/SAX/filter/XMLBaseTracker.hpp b/include/SAX/filter/XMLBaseTracker.hpp
index e7945ca2..6a3b1709 100644
--- a/include/SAX/filter/XMLBaseTracker.hpp
+++ b/include/SAX/filter/XMLBaseTracker.hpp
@@ -11,15 +11,14 @@ namespace Arabica
 namespace SAX
 {
 
-template<class string_type, class T0 = Arabica::nil_t, class T1 = Arabica::nil_t>
-class XMLBaseTracker : public XMLFilterImpl<string_type, T0, T1>
+template<class string_type, class string_adaptor = Arabica::default_string_adaptor<string_type> >
+class XMLBaseTracker : public XMLFilterImpl<string_type, string_adaptor>
 {
-  typedef XMLFilterImpl<string_type, T0, T1> XMLFilterT;
-  typedef typename XMLFilterT::string_adaptor string_adaptor;
+  typedef XMLFilterImpl<string_type, string_adaptor> XMLFilterT;
   typedef XMLBaseSupport<string_type, string_adaptor> XMLBaseSupportT;
 
 public:
-  typedef XMLReaderInterface<string_type, T0, T1> XMLReaderT;
+  typedef XMLReaderInterface<string_type, string_adaptor> XMLReaderT;
   typedef Locator<string_type, string_adaptor> LocatorT;
   typedef Attributes<string_type, string_adaptor> AttributesT;
 
diff --git a/include/SAX/helpers/XMLFilterImpl.hpp b/include/SAX/helpers/XMLFilterImpl.hpp
index 3329d502..98abec27 100644
--- a/include/SAX/helpers/XMLFilterImpl.hpp
+++ b/include/SAX/helpers/XMLFilterImpl.hpp
@@ -36,21 +36,17 @@ namespace SAX
  * @see ContentHandler
  * @see ErrorHandler
  */
-template<class string_type, class T0 = Arabica::nil_t, class T1 = Arabica::nil_t>
-class XMLFilterImpl : public XMLFilter<string_type, T0, T1>,
-                            public EntityResolver<string_type, typename XMLFilter<string_type, T0, T1>::string_adaptor>, 
-                            public DTDHandler<string_type, typename XMLFilter<string_type, T0, T1>::string_adaptor>,
-                            public ContentHandler<string_type, typename XMLFilter<string_type, T0, T1>::string_adaptor>, 
-                            public ErrorHandler<string_type, typename XMLFilter<string_type, T0, T1>::string_adaptor>,
-                            public DeclHandler<string_type, typename XMLFilter<string_type, T0, T1>::string_adaptor>,
-                            public LexicalHandler<string_type, typename XMLFilter<string_type, T0, T1>::string_adaptor>
+template<class string_type, class string_adaptor>
+class XMLFilterImpl : public XMLFilter<string_type, string_adaptor>,
+                            public EntityResolver<string_type, string_adaptor>, 
+                            public DTDHandler<string_type, string_adaptor>,
+                            public ContentHandler<string_type, string_adaptor>, 
+                            public ErrorHandler<string_type, string_adaptor>,
+                            public DeclHandler<string_type, string_adaptor>,
+                            public LexicalHandler<string_type, string_adaptor>
 {
 public:
-  typedef typename Arabica::get_param<Arabica::string_adaptor_tag, 
-                             Arabica::default_string_adaptor<string_type>, 
-                             T0, 
-                             T1>::type string_adaptor;
-  typedef XMLReaderInterface<string_type, T0, T1> XMLReaderT;
+  typedef XMLReaderInterface<string_type, string_adaptor> XMLReaderT;
   typedef EntityResolver<string_type, string_adaptor> EntityResolverT;
   typedef DTDHandler<string_type, string_adaptor> DTDHandlerT;
   typedef ContentHandler<string_type, string_adaptor> ContentHandlerT;
diff --git a/include/SAX/wrappers/saxexpat.hpp b/include/SAX/wrappers/saxexpat.hpp
index b9a31330..be165ba9 100644
--- a/include/SAX/wrappers/saxexpat.hpp
+++ b/include/SAX/wrappers/saxexpat.hpp
@@ -200,12 +200,15 @@ private:
 template<class string_type, 
          class T0 = Arabica::nil_t,
          class T1 = Arabica::nil_t>
-class expat_wrapper : public SAX::XMLReaderInterface<string_type, T0, T1>, 
-                      public SAX::Locator<string_type, typename SAX::XMLReaderInterface<string_type, T0, T1>::string_adaptor>, 
-                      public expat_wrapper_impl_mumbojumbo::expat2base
+class expat_wrapper : 
+    public SAX::XMLReaderInterface<string_type, 
+                                   typename Arabica::get_string_adaptor<string_type, T0, T1>::type>,
+    public SAX::Locator<string_type, typename Arabica::get_string_adaptor<string_type, T0, T1>::type>,
+    public expat_wrapper_impl_mumbojumbo::expat2base
 {
   public:
-    typedef SAX::XMLReaderInterface<string_type, T0, T1> XMLReaderT;
+    typedef SAX::XMLReaderInterface<string_type, 
+                                    typename Arabica::get_string_adaptor<string_type, T0, T1>::type> XMLReaderT;
     typedef typename XMLReaderT::string_adaptor string_adaptor;
     typedef string_adaptor SA;
     typedef SAX::EntityResolver<string_type, string_adaptor> entityResolverT;
diff --git a/include/SAX/wrappers/saxmsxml2.hpp b/include/SAX/wrappers/saxmsxml2.hpp
index b4cdd1c2..c068f1da 100644
--- a/include/SAX/wrappers/saxmsxml2.hpp
+++ b/include/SAX/wrappers/saxmsxml2.hpp
@@ -60,10 +60,15 @@ class COMMultiThreadInitializer  : public COMInitializer_tag
 template<class string_type, 
          class T0 = Arabica::nil_t,
          class T1 = Arabica::nil_t>
-class msxml2_wrapper : public SAX::XMLReaderInterface<string_type, T0, T1>
+class msxml2_wrapper : 
+    public SAX::XMLReaderInterface<string_type, 
+                                   typename Arabica::get_string_adaptor<string_type, T0, T1>::type>
 {
   public:
-    typedef SAX::XMLReaderInterface<string_type, T0, T1> XMLReaderT;
+    typedef SAX::XMLReaderInterface<string_type, typename Arabica::get_param<Arabica::string_adaptor_tag, 
+                                     Arabica::default_string_adaptor<string_type>, 
+                                     T0, 
+                                     T1>::type> XMLReaderT;
     typedef typename XMLReaderT::string_adaptor string_adaptor;
     typedef typename Arabica::get_param<COMInitializer_tag, 
                                         COMSingleThreadInitializer, 
diff --git a/include/Taggle/impl/Parser.hpp b/include/Taggle/impl/Parser.hpp
index 677c2221..564b7f85 100644
--- a/include/Taggle/impl/Parser.hpp
+++ b/include/Taggle/impl/Parser.hpp
@@ -24,15 +24,14 @@ The Taggle SAX parser class.
 Based on code from John Cowan's super TagSoup package
 **/
 template<class string_type, 
-         class T0 = Arabica::nil_t,
-         class T1 = Arabica::nil_t>
+         class string_adaptor_type = Arabica::default_string_adaptor<string_type> >
 class Taggle  : 
-    public XMLReaderInterface<string_type, T0, T1>,
-    private DefaultHandler<string_type, typename XMLReaderInterface<string_type, T0, T1>::string_adaptor>,
+    public XMLReaderInterface<string_type, string_adaptor_type>,
+    private DefaultHandler<string_type, string_adaptor_type>,
     private ScanHandler
 {
 public:
-  typedef XMLReaderInterface<string_type, T0, T1> XMLReaderT;
+  typedef XMLReaderInterface<string_type, string_adaptor_type> XMLReaderT;
   typedef typename XMLReaderT::string_adaptor string_adaptor;
   typedef ContentHandler<string_type, string_adaptor> ContentHandlerT;
   typedef LexicalHandler<string_type, string_adaptor> LexicalHandlerT;
@@ -397,7 +396,7 @@ public:
       CDATAElements = value;
   } // setFeature
 
-  typedef typename XMLReaderInterface<string_type, T0, T1>::PropertyBase PropertyBaseT;
+  typedef typename XMLReaderInterface<string_type, string_adaptor_type>::PropertyBase PropertyBaseT;
   virtual std::auto_ptr<PropertyBaseT> doGetProperty(const string_type& name)
   {
     return std::auto_ptr<PropertyBaseT>(0);
@@ -1306,83 +1305,83 @@ public:
   } // S
 }; // class Taggle
 
-template<class string_type, class T0, class T1>
-bool Taggle<string_type, T0, T1>::DEFAULT_NAMESPACES = true;
-template<class string_type, class T0, class T1>
-bool Taggle<string_type, T0, T1>::DEFAULT_IGNORE_BOGONS = false;
-template<class string_type, class T0, class T1>
-bool Taggle<string_type, T0, T1>::DEFAULT_BOGONS_EMPTY = false;
-template<class string_type, class T0, class T1>
-bool Taggle<string_type, T0, T1>::DEFAULT_ROOT_BOGONS = true;
-template<class string_type, class T0, class T1>
-bool Taggle<string_type, T0, T1>::DEFAULT_DEFAULT_ATTRIBUTES = true;
-template<class string_type, class T0, class T1>
-bool Taggle<string_type, T0, T1>::DEFAULT_TRANSLATE_COLONS = false;
-template<class string_type, class T0, class T1>
-bool Taggle<string_type, T0, T1>::DEFAULT_RESTART_ELEMENTS = true;
-template<class string_type, class T0, class T1>
-bool Taggle<string_type, T0, T1>::DEFAULT_IGNORABLE_WHITESPACE = false;
-template<class string_type, class T0, class T1>
-bool Taggle<string_type, T0, T1>::DEFAULT_CDATA_ELEMENTS = true;
+template<class string_type, class string_adaptor_type>
+bool Taggle<string_type, string_adaptor_type>::DEFAULT_NAMESPACES = true;
+template<class string_type, class string_adaptor_type>
+bool Taggle<string_type, string_adaptor_type>::DEFAULT_IGNORE_BOGONS = false;
+template<class string_type, class string_adaptor_type>
+bool Taggle<string_type, string_adaptor_type>::DEFAULT_BOGONS_EMPTY = false;
+template<class string_type, class string_adaptor_type>
+bool Taggle<string_type, string_adaptor_type>::DEFAULT_ROOT_BOGONS = true;
+template<class string_type, class string_adaptor_type>
+bool Taggle<string_type, string_adaptor_type>::DEFAULT_DEFAULT_ATTRIBUTES = true;
+template<class string_type, class string_adaptor_type>
+bool Taggle<string_type, string_adaptor_type>::DEFAULT_TRANSLATE_COLONS = false;
+template<class string_type, class string_adaptor_type>
+bool Taggle<string_type, string_adaptor_type>::DEFAULT_RESTART_ELEMENTS = true;
+template<class string_type, class string_adaptor_type>
+bool Taggle<string_type, string_adaptor_type>::DEFAULT_IGNORABLE_WHITESPACE = false;
+template<class string_type, class string_adaptor_type>
+bool Taggle<string_type, string_adaptor_type>::DEFAULT_CDATA_ELEMENTS = true;
 
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::namespacesFeature = Taggle<string_type, T0, T1>::S("http://xml.org/sax/features/namespaces");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::namespacePrefixesFeature = Taggle<string_type, T0, T1>::S("http://xml.org/sax/features/namespace-prefixes");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::externalGeneralEntitiesFeature = Taggle<string_type, T0, T1>::S("http://xml.org/sax/features/external-general-entities");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::externalParameterEntitiesFeature = Taggle<string_type, T0, T1>::S("http://xml.org/sax/features/external-parameter-entities");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::isStandaloneFeature = Taggle<string_type, T0, T1>::S("http://xml.org/sax/features/is-standalone");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::lexicalHandlerParameterEntitiesFeature = Taggle<string_type, T0, T1>::S("http://xml.org/sax/features/lexical-handler/parameter-entities");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::resolveDTDURIsFeature = Taggle<string_type, T0, T1>::S("http://xml.org/sax/features/resolve-dtd-uris");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::stringInterningFeature = Taggle<string_type, T0, T1>::S("http://xml.org/sax/features/string-interning");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::useAttributes2Feature = Taggle<string_type, T0, T1>::S("http://xml.org/sax/features/use-attributes2");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::useLocator2Feature = Taggle<string_type, T0, T1>::S("http://xml.org/sax/features/use-locator2");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::useEntityResolver2Feature = Taggle<string_type, T0, T1>::S("http://xml.org/sax/features/use-entity-resolver2");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::validationFeature = Taggle<string_type, T0, T1>::S("http://xml.org/sax/features/validation");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::unicodeNormalizationCheckingFeature = Taggle<string_type, T0, T1>::S("http://xml.org/sax/features/unicode-normalization-checking");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::xmlnsURIsFeature = Taggle<string_type, T0, T1>::S("http://xml.org/sax/features/xmlns-uris");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::XML11Feature = Taggle<string_type, T0, T1>::S("http://xml.org/sax/features/xml-1.1");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::ignoreBogonsFeature = Taggle<string_type, T0, T1>::S("http://www.ccil.org/~cowan/tagsoup/features/ignore-bogons");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::bogonsEmptyFeature = Taggle<string_type, T0, T1>::S("http://www.ccil.org/~cowan/tagsoup/features/bogons-empty");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::rootBogonsFeature = Taggle<string_type, T0, T1>::S("http://www.ccil.org/~cowan/tagsoup/features/root-bogons");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::defaultAttributesFeature = Taggle<string_type, T0, T1>::S("http://www.ccil.org/~cowan/tagsoup/features/default-attributes");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::translateColonsFeature = Taggle<string_type, T0, T1>::S("http://www.ccil.org/~cowan/tagsoup/features/translate-colons");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::restartElementsFeature = Taggle<string_type, T0, T1>::S("http://www.ccil.org/~cowan/tagsoup/features/restart-elements");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::ignorableWhitespaceFeature = Taggle<string_type, T0, T1>::S("http://www.ccil.org/~cowan/tagsoup/features/ignorable-whitespace");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::CDATAElementsFeature = Taggle<string_type, T0, T1>::S("http://www.ccil.org/~cowan/tagsoup/features/cdata-elements");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::lexicalHandlerProperty = Taggle<string_type, T0, T1>::S("http://xml.org/sax/properties/lexical-handler");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::scannerProperty = Taggle<string_type, T0, T1>::S("http://www.ccil.org/~cowan/tagsoup/properties/scanner");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::schemaProperty = Taggle<string_type, T0, T1>::S("http://www.ccil.org/~cowan/tagsoup/properties/schema");
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::autoDetectorProperty = Taggle<string_type, T0, T1>::S("http://www.ccil.org/~cowan/tagsoup/properties/auto-detector");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::namespacesFeature = Taggle<string_type, string_adaptor_type>::S("http://xml.org/sax/features/namespaces");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::namespacePrefixesFeature = Taggle<string_type, string_adaptor_type>::S("http://xml.org/sax/features/namespace-prefixes");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::externalGeneralEntitiesFeature = Taggle<string_type, string_adaptor_type>::S("http://xml.org/sax/features/external-general-entities");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::externalParameterEntitiesFeature = Taggle<string_type, string_adaptor_type>::S("http://xml.org/sax/features/external-parameter-entities");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::isStandaloneFeature = Taggle<string_type, string_adaptor_type>::S("http://xml.org/sax/features/is-standalone");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::lexicalHandlerParameterEntitiesFeature = Taggle<string_type, string_adaptor_type>::S("http://xml.org/sax/features/lexical-handler/parameter-entities");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::resolveDTDURIsFeature = Taggle<string_type, string_adaptor_type>::S("http://xml.org/sax/features/resolve-dtd-uris");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::stringInterningFeature = Taggle<string_type, string_adaptor_type>::S("http://xml.org/sax/features/string-interning");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::useAttributes2Feature = Taggle<string_type, string_adaptor_type>::S("http://xml.org/sax/features/use-attributes2");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::useLocator2Feature = Taggle<string_type, string_adaptor_type>::S("http://xml.org/sax/features/use-locator2");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::useEntityResolver2Feature = Taggle<string_type, string_adaptor_type>::S("http://xml.org/sax/features/use-entity-resolver2");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::validationFeature = Taggle<string_type, string_adaptor_type>::S("http://xml.org/sax/features/validation");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::unicodeNormalizationCheckingFeature = Taggle<string_type, string_adaptor_type>::S("http://xml.org/sax/features/unicode-normalization-checking");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::xmlnsURIsFeature = Taggle<string_type, string_adaptor_type>::S("http://xml.org/sax/features/xmlns-uris");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::XML11Feature = Taggle<string_type, string_adaptor_type>::S("http://xml.org/sax/features/xml-1.1");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::ignoreBogonsFeature = Taggle<string_type, string_adaptor_type>::S("http://www.ccil.org/~cowan/tagsoup/features/ignore-bogons");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::bogonsEmptyFeature = Taggle<string_type, string_adaptor_type>::S("http://www.ccil.org/~cowan/tagsoup/features/bogons-empty");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::rootBogonsFeature = Taggle<string_type, string_adaptor_type>::S("http://www.ccil.org/~cowan/tagsoup/features/root-bogons");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::defaultAttributesFeature = Taggle<string_type, string_adaptor_type>::S("http://www.ccil.org/~cowan/tagsoup/features/default-attributes");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::translateColonsFeature = Taggle<string_type, string_adaptor_type>::S("http://www.ccil.org/~cowan/tagsoup/features/translate-colons");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::restartElementsFeature = Taggle<string_type, string_adaptor_type>::S("http://www.ccil.org/~cowan/tagsoup/features/restart-elements");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::ignorableWhitespaceFeature = Taggle<string_type, string_adaptor_type>::S("http://www.ccil.org/~cowan/tagsoup/features/ignorable-whitespace");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::CDATAElementsFeature = Taggle<string_type, string_adaptor_type>::S("http://www.ccil.org/~cowan/tagsoup/features/cdata-elements");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::lexicalHandlerProperty = Taggle<string_type, string_adaptor_type>::S("http://xml.org/sax/properties/lexical-handler");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::scannerProperty = Taggle<string_type, string_adaptor_type>::S("http://www.ccil.org/~cowan/tagsoup/properties/scanner");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::schemaProperty = Taggle<string_type, string_adaptor_type>::S("http://www.ccil.org/~cowan/tagsoup/properties/schema");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::autoDetectorProperty = Taggle<string_type, string_adaptor_type>::S("http://www.ccil.org/~cowan/tagsoup/properties/auto-detector");
 
-template<class string_type, class T0, class T1>
-const string_type Taggle<string_type, T0, T1>::legal =
-  Taggle<string_type, T0, T1>::S("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-'()+,./:=?;!*#@$_%");
+template<class string_type, class string_adaptor_type>
+const string_type Taggle<string_type, string_adaptor_type>::legal =
+  Taggle<string_type, string_adaptor_type>::S("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-'()+,./:=?;!*#@$_%");
 
 } // namespace SAX
 
diff --git a/vs9/Arabica.sln b/vs9/Arabica.sln
new file mode 100644
index 00000000..1ef9cd1d
--- /dev/null
+++ b/vs9/Arabica.sln
@@ -0,0 +1,97 @@
+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
+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
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/vs9/Arabica_noboost.sln b/vs9/Arabica_noboost.sln
new file mode 100644
index 00000000..14736901
--- /dev/null
+++ b/vs9/Arabica_noboost.sln
@@ -0,0 +1,82 @@
+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
+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
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/vs9/Arabica_noboost_tests.sln b/vs9/Arabica_noboost_tests.sln
new file mode 100644
index 00000000..45db68f7
--- /dev/null
+++ b/vs9/Arabica_noboost_tests.sln
@@ -0,0 +1,102 @@
+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
new file mode 100644
index 00000000..b4e23be7
--- /dev/null
+++ b/vs9/Arabica_tests.sln
@@ -0,0 +1,171 @@
+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}
+		{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}
+	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}
+	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}
+	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}
+	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}
+	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_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}
+		{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}
+	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}
+		{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}
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
+	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
+		{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
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/vs9/example_DOM_writer.vcproj b/vs9/example_DOM_writer.vcproj
new file mode 100644
index 00000000..8a30666f
--- /dev/null
+++ b/vs9/example_DOM_writer.vcproj
@@ -0,0 +1,202 @@
+<?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_pyx.vcproj b/vs9/example_SAX_pyx.vcproj
new file mode 100644
index 00000000..c89d4376
--- /dev/null
+++ b/vs9/example_SAX_pyx.vcproj
@@ -0,0 +1,208 @@
+<?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
new file mode 100644
index 00000000..8197559a
--- /dev/null
+++ b/vs9/example_SAX_simplehander.vcproj
@@ -0,0 +1,220 @@
+<?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
new file mode 100644
index 00000000..e521c08b
--- /dev/null
+++ b/vs9/example_SAX_writer.vcproj
@@ -0,0 +1,207 @@
+<?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
new file mode 100644
index 00000000..a4b10f21
--- /dev/null
+++ b/vs9/example_SAX_xmlbase.vcproj
@@ -0,0 +1,195 @@
+<?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
new file mode 100644
index 00000000..14b8f3fc
--- /dev/null
+++ b/vs9/example_Utils_transcode.vcproj
@@ -0,0 +1,199 @@
+<?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
new file mode 100644
index 00000000..694ed4f8
--- /dev/null
+++ b/vs9/example_XPath_xgrep.vcproj
@@ -0,0 +1,195 @@
+<?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
new file mode 100644
index 00000000..53bd7eac
--- /dev/null
+++ b/vs9/example_XSLT_Mangle.vcproj
@@ -0,0 +1,436 @@
+<?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_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_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_message.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\Xslt\impl\xslt_namespace_stack.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\Xslt\impl\xslt_param.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_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>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/vs9/lib_arabica.vcproj b/vs9/lib_arabica.vcproj
new file mode 100644
index 00000000..64465f5e
--- /dev/null
+++ b/vs9/lib_arabica.vcproj
@@ -0,0 +1,1013 @@
+<?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\ParserAdaptor.hpp"
+						>
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\PropertyNames.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 ..\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/lib_arabica_noboost.vcproj b/vs9/lib_arabica_noboost.vcproj
new file mode 100644
index 00000000..2325d7d2
--- /dev/null
+++ b/vs9/lib_arabica_noboost.vcproj
@@ -0,0 +1,1013 @@
+<?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\ParserAdaptor.hpp"
+						>
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\PropertyNames.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/test_DOM.vcproj b/vs9/test_DOM.vcproj
new file mode 100644
index 00000000..5bdf9f02
--- /dev/null
+++ b/vs9/test_DOM.vcproj
@@ -0,0 +1,336 @@
+<?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"
+				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_ProcessingInstruction.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_SAX2DOM.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\tests\DOM\test_Siblings.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\tests\DOM\test_Text.hpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="CppUnit"
+			>
+			<File
+				RelativePath="..\tests\CppUnit\framework\CppUnitException.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\estring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Guards.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Test.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCaller.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/vs9/test_DOM_silly.vcproj b/vs9/test_DOM_silly.vcproj
new file mode 100644
index 00000000..82251b65
--- /dev/null
+++ b/vs9/test_DOM_silly.vcproj
@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="test_DOM_silly"
+	ProjectGUID="{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}"
+	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"
+				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_Text.hpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="CppUnit"
+			>
+			<File
+				RelativePath="..\tests\CppUnit\framework\CppUnitException.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\estring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Guards.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Test.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCaller.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/vs9/test_DOM_wide.vcproj b/vs9/test_DOM_wide.vcproj
new file mode 100644
index 00000000..e909a0d5
--- /dev/null
+++ b/vs9/test_DOM_wide.vcproj
@@ -0,0 +1,336 @@
+<?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"
+				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_Text.hpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="CppUnit"
+			>
+			<File
+				RelativePath="..\tests\CppUnit\framework\CppUnitException.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\estring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Guards.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Test.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCaller.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/vs9/test_SAX_filter.vcproj b/vs9/test_SAX_filter.vcproj
new file mode 100644
index 00000000..92f68514
--- /dev/null
+++ b/vs9/test_SAX_filter.vcproj
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="test_SAX_filter"
+	ProjectGUID="{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}"
+	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"
+				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="CppUnit"
+			>
+			<File
+				RelativePath="..\tests\CppUnit\framework\CppUnitException.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\estring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Guards.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Test.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCaller.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			>
+			<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
new file mode 100644
index 00000000..4deadeed
--- /dev/null
+++ b/vs9/test_SAX_filter_silly.vcproj
@@ -0,0 +1,286 @@
+<?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"
+				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="CppUnit"
+			>
+			<File
+				RelativePath="..\tests\CppUnit\framework\CppUnitException.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\estring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Guards.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Test.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCaller.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			>
+			<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
new file mode 100644
index 00000000..c9a17bcd
--- /dev/null
+++ b/vs9/test_SAX_filter_wide.vcproj
@@ -0,0 +1,286 @@
+<?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"
+				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="CppUnit"
+			>
+			<File
+				RelativePath="..\tests\CppUnit\framework\CppUnitException.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\estring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Guards.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Test.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCaller.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			>
+			<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
new file mode 100644
index 00000000..024cb337
--- /dev/null
+++ b/vs9/test_utils.vcproj
@@ -0,0 +1,300 @@
+<?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"
+				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_uri.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Utils\test_xml_strings.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Utils\util_test_suite.hpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="CppUnit"
+			>
+			<File
+				RelativePath="..\tests\CppUnit\framework\CppUnitException.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\estring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Guards.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Test.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCaller.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/vs9/test_xpath.vcproj b/vs9/test_xpath.vcproj
new file mode 100644
index 00000000..f3e20f7a
--- /dev/null
+++ b/vs9/test_xpath.vcproj
@@ -0,0 +1,332 @@
+<?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"
+				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\value_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\xpath_test_suite.hpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="CppUnit"
+			>
+			<File
+				RelativePath="..\tests\CppUnit\framework\CppUnitException.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\estring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Guards.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Test.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCaller.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/vs9/test_xpath_silly.vcproj b/vs9/test_xpath_silly.vcproj
new file mode 100644
index 00000000..2059511a
--- /dev/null
+++ b/vs9/test_xpath_silly.vcproj
@@ -0,0 +1,338 @@
+<?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"
+				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>
+		<Filter
+			Name="CppUnit"
+			>
+			<File
+				RelativePath="..\tests\CppUnit\framework\CppUnitException.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\estring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Guards.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Test.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCaller.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/vs9/test_xpath_wide.vcproj b/vs9/test_xpath_wide.vcproj
new file mode 100644
index 00000000..8c21130b
--- /dev/null
+++ b/vs9/test_xpath_wide.vcproj
@@ -0,0 +1,330 @@
+<?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"
+				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>
+		<Filter
+			Name="CppUnit"
+			>
+			<File
+				RelativePath="..\tests\CppUnit\framework\CppUnitException.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\estring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Guards.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Test.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCaller.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/vs9/test_xslt.vcproj b/vs9/test_xslt.vcproj
new file mode 100644
index 00000000..e84e0e1b
--- /dev/null
+++ b/vs9/test_xslt.vcproj
@@ -0,0 +1,300 @@
+<?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"
+				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>
+		<Filter
+			Name="CppUnit"
+			>
+			<File
+				RelativePath="..\tests\CppUnit\framework\CppUnitException.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\estring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Guards.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Test.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCaller.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.h"
+				>
+			</File>
+		</Filter>
+		<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>