diff --git a/doc/acknowledgments.html b/doc/acknowledgments.html
index e0484881..cb2f9800 100644
--- a/doc/acknowledgments.html
+++ b/doc/acknowledgments.html
@@ -27,6 +27,8 @@ http://www.boost.org/LICENSE_1_0.txt)
 </table>
 <hr>
 <ul>
+  <li>Takatoshi Kondo found and corrected a very obscure and difficult bug in the 
+  serialization of virtual base classes.
   <li><a href="http://www.autoform.com">AutoForm Engineering GmbH</a> supported
   development efforts to extend correct serialization to objects stored in DLLS.
   <li><a href"http://www.cadence.com/il">Cadence Israel</a> supported enhancement
diff --git a/doc/exceptions.html b/doc/exceptions.html
index 2987b4ae..789ebc16 100644
--- a/doc/exceptions.html
+++ b/doc/exceptions.html
@@ -33,7 +33,8 @@ http://www.boost.org/LICENSE_1_0.txt)
   <dt><a href="#pointer_conflict"><code style="white-space: normal">pointer_conflict</code></a>
   <dt><a href="#incompatible_native_format"><code style="white-space: normal">incompatible_native_format</code></a>
   <dt><a href="#array_size_too_short"><code style="white-space: normal">array_size_too_short</code></a>
-  <dt><a href="#stream_error"><code style="white-space: normal">stream_error</code></a>
+  <dt><a href="#input_stream_error"><code style="white-space: normal">input_stream_error</code></a>
+  <dt><a href="#output_stream_error"><code style="white-space: normal">output_stream_error</code></a>
   <dt><a href="#invalid_class_name"><code style="white-space: normal">invalid_class_name</code></a>
   <dt><a href="#unregistered_class"><code style="white-space: normal">unregistered_class</code></a>
   <dt><a href="#multiple_code_instantiation"><code style="white-space: normal">multiple_code_instantiation</code></a>
@@ -70,7 +71,7 @@ public:
         incompatible_native_format, // attempt to read native binary format
                                 // on incompatible platform
         array_size_too_short,   // array being loaded doesn't fit in array allocated
-        stream_error            // i/o error on stream
+        input_stream_error      // error on stream input
         invalid_class_name,     // class name greater than the maximum permitted.
                                 // most likely a corrupted archive or an attempt
                                 // to insert virus via buffer overrun method.
@@ -79,8 +80,9 @@ public:
         unsupported_class_version, // type saved with a version # greater than the 
                             // one used by the program.  This indicates that the proggram
                             // needs to be rebuilt.
-        multiple_code_instantiation // code for implementing serialization for some
+        multiple_code_instantiation, // code for implementing serialization for some
                             // type has been instantiated in more than one module.
+        output_stream_error     // error on stream output
     } exception_code;
     exception_code code;
     archive_exception(exception_code c) : code(c) {}
@@ -177,7 +179,11 @@ An attempt has been made to read an array that is larger than the array size.
 This should only occur when the size of an array in code is reduced after an
 archive has already been created.
 
-<h3><a name="stream_error"><code style="white-space: normal">stream_error</code></a></h3>
+<h3>
+<a name="input_stream_error"><code style="white-space: normal">input_stream_error</code></a>
+<br>
+<a name="output_stream_error"><code style="white-space: normal">output_stream_error</code></a>
+</h3>
 An error has occured during stream input or ouput.  Aside from the common 
 situations such as a corrupted or truncated input file, there are 
 several less obvious ones that sometimes occur.
diff --git a/doc/extended_type_info.html b/doc/extended_type_info.html
index 8f75cc13..b4b48550 100644
--- a/doc/extended_type_info.html
+++ b/doc/extended_type_info.html
@@ -269,7 +269,7 @@ Return a pointer to the
 instance that corresponds to
 the "true type" of the type T.  The "true type" is the lowest type in the
 hierarchy of classes.  The type T can always be cast to the "true type" with
-a static cast.  Implemention of this function will vary among type id systems
+a static cast.  Implementation of this function will vary among type id systems
 and sometimes will make presumptions about the type T than can be identified
 with a particular <code style="white-space: normal">extended_type_info</code> implementation.
 </dd>
@@ -321,7 +321,7 @@ proper destructor and recovers allocated memory.
 <h3><a name="models">Models</a></h3>
 The serialization library includes two distinct
 <code style="white-space: normal"><a target="extended_type_info.hpp" href="../../../boost/serialization/extended_type_info.hpp">extended_type_info</a></code>
-implementatio's.
+implementations.
 <p>
 <code style="white-space: normal"><h4><a target="extended_type_info_typeid.hpp" href = "../../../boost/serialization/extended_type_info_typeid.hpp">
 extended_type_info_typeid</a></h4></code>is implemented in terms of the standard typeid(). It presumes that RTTI support is enabled
@@ -408,7 +408,7 @@ constructor of "my_class".
 
 
 A complete example of this can be found
-<a target="test_plugin.cpp" href="test_plugin.cpp">here</a>
+<a target="test_dll_plugin.cpp" href="../test/test_dll_plugin.cpp">here</a>
 <hr>
 <p><i>&copy; Copyright <a href="http://www.rrsd.com">Robert Ramey</a> 2005-2009. 
 Distributed under the Boost Software License, Version 1.0. (See
diff --git a/doc/faq.html b/doc/faq.html
index 5830b8f9..3cdb8fbe 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -38,16 +38,14 @@ in a constructive way by adding in your own item.  The best way to do this
 is to create a <a href="http://svn.boost.org/trac/boost/browser">"TRAK" item</a> 
 which includes the text you want to add to this list.
 
-    <ul>
-        <li><h4>
-        <a name="differences_1_37"></a>Differences from Boost 1.37</h2>
-        </h4></li>
-    </ul>
-    <hr>
-    <p>
-        <i>&copy; Copyright <a href="http://www.rrsd.com">Robert Ramey</a> 2002-2009. Distributed
-            under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt
-            or copy at http://www.boost.org/LICENSE_1_0.txt) </i>
-    </p>
+<ul>
+<li><h4>
+</h4></li>
+</ul>
+<hr>
+<p>
+<i>&copy; Copyright <a href="http://www.rrsd.com">Robert Ramey</a> 2002-2009. Distributed
+under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt
+or copy at http://www.boost.org/LICENSE_1_0.txt) </i></p>
 </body>
 </html>
diff --git a/doc/release.html b/doc/release.html
index 1559c94a..3594ea62 100644
--- a/doc/release.html
+++ b/doc/release.html
@@ -1,6 +1,6 @@
 <!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-    <!--
+<!--
 (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . 
 Use, modification and distribution is subject to the Boost Software
 License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -29,6 +29,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 </table>
 <hr>
 <dl class="index">
+    <dt><a href="#differences_1_43">Differences from version 1.43</a></dt> 
     <dt><a href="#differences_1_42">Differences from version 1.42</a></dt> 
     <dt><a href="#differences_1_41">Differences from version 1.41</a></dt> 
     <dt><a href="#differences_1_40">Differences from version 1.40</a></dt> 
@@ -43,6 +44,11 @@ http://www.boost.org/LICENSE_1_0.txt)
 As of this writing, there are no known bugs. However, due to compiler/library 
 quirks and or bugs, some tests fail with some combinations of compilers and 
 libraries.
+<h2><a name="differences_1_43"></a>Differences from Boost 1.43</h2>
+<ul>
+    <li>fixed bug in the serialization of virtual base classes.  Due
+    to heroic efforts by Takatoshi Kondo.
+</ul>
 <h2><a name="differences_1_42"></a>Differences from Boost 1.42</h2>
 <ul>
     <li>fixed failure of shared_ptr serialization when serializing pointers
@@ -216,7 +222,7 @@ filed as TRAK tickets have been addressed.
     <li>
     Pointers to pointers cannot currently be serialized
     <li>
-        Its possible that <code style="white-space: normal">std::string</code> and <code style="white-space: normal">
+        It's possible that <code style="white-space: normal">std::string</code> and <code style="white-space: normal">
             std::wstring</code>
     contain characters such as '\0' and -1 (EOF) which cannot be rendered in text 
     and XML archives without an escape mechanism. Currently there is no such escape 
@@ -227,6 +233,9 @@ filed as TRAK tickets have been addressed.
         serialization of <code style="white-space: normal">std::map</code>
     for those compilers which do not support partial template specialization. Also, 
     types which contain pointers or tracked types might not work correctly.
+    <li>
+        Serialization of virtual base classes relies upon RTTI.  It will fail when used on
+        systems which don't have RTTI enabled.
 </ul>
 <p>
     Aside from the above, there are a number of issues related to specific 
diff --git a/example/demo_portable_archive.cpp b/example/demo_portable_archive.cpp
index 2149585d..6d9fb2be 100644
--- a/example/demo_portable_archive.cpp
+++ b/example/demo_portable_archive.cpp
@@ -27,6 +27,7 @@ class A
 {
     friend class boost::serialization::access;
     char c;
+    A *pa;
     int i;
     int i2; // special tricky case to check sign extension
     unsigned int ui;
@@ -49,6 +50,7 @@ public:
     }
     A() :
         c(0xFF & std::rand()),
+        pa(0),
         i(std::rand()),
         i2(0x80),
         ui(std::rand()),
diff --git a/example/demo_shared_ptr.cpp b/example/demo_shared_ptr.cpp
index c4645169..fb347a7c 100644
--- a/example/demo_shared_ptr.cpp
+++ b/example/demo_shared_ptr.cpp
@@ -82,7 +82,7 @@ void display(boost::shared_ptr<A> &spa, boost::shared_ptr<A> &spa1)
     std::cout << "unique element count = " << A::count << std::endl;
 }
 
-int main(int /* argc */, char /* *argv[] */)
+int main(int /* argc */, char * /*argv*/[])
 {
     std::string filename(boost::archive::tmpdir());
     filename += "/testfile";
diff --git a/example/demo_trivial_archive.cpp b/example/demo_trivial_archive.cpp
index a7138321..21be5963 100644
--- a/example/demo_trivial_archive.cpp
+++ b/example/demo_trivial_archive.cpp
@@ -20,7 +20,7 @@ public:
     // serialization library
     typedef boost::mpl::bool_<true> is_saving; 
     typedef boost::mpl::bool_<false> is_loading;
-    template<class T> register_type(){}
+    template<class T> void register_type(){}
     template<class T> trivial_oarchive & operator<<(const T & t){
         return *this;
     }
diff --git a/example/log_archive.hpp b/example/log_archive.hpp
index 67d848fe..d38181ab 100644
--- a/example/log_archive.hpp
+++ b/example/log_archive.hpp
@@ -30,7 +30,7 @@ class log_archive :
     // give serialization implementation access to this clas
     friend class boost::archive::detail::interface_oarchive<log_archive>;
     friend class boost::archive::basic_xml_oarchive<log_archive>;
-    friend boost::archive::save_access;
+    friend class boost::archive::save_access;
 
     /////////////////////////////////////////////////////////////////////
     // Override functions defined in basic_xml_oarchive
diff --git a/example/portable_binary_iarchive.cpp b/example/portable_binary_iarchive.cpp
index 445d69bb..6b8d7ccd 100644
--- a/example/portable_binary_iarchive.cpp
+++ b/example/portable_binary_iarchive.cpp
@@ -84,11 +84,11 @@ portable_binary_iarchive::init(unsigned int flags){
             );
         // make sure the version of the reading archive library can
         // support the format of the archive being read
-        boost::archive::version_type input_library_version;
+        boost::archive::library_version_type input_library_version;
         * this >> input_library_version;
 
         // extra little .t is to get around borland quirk
-        if(boost::archive::BOOST_ARCHIVE_VERSION() < input_library_version.t)
+        if(boost::archive::BOOST_ARCHIVE_VERSION() < input_library_version)
             boost::serialization::throw_exception(
                 boost::archive::archive_exception(
                     boost::archive::archive_exception::unsupported_version
@@ -111,12 +111,16 @@ portable_binary_iarchive::init(unsigned int flags){
     m_flags = x << CHAR_BIT;
 }
 
+#include <boost/archive/impl/archive_serializer_map.ipp>
 #include <boost/archive/impl/basic_binary_iprimitive.ipp>
 
-
 namespace boost {
 namespace archive {
 
+namespace detail {
+    template class archive_serializer_map<portable_binary_iarchive>;
+}
+
 template class basic_binary_iprimitive<
     portable_binary_iarchive,
     std::istream::char_type, 
diff --git a/example/portable_binary_iarchive.hpp b/example/portable_binary_iarchive.hpp
index 6c3af4f7..61944f5b 100644
--- a/example/portable_binary_iarchive.hpp
+++ b/example/portable_binary_iarchive.hpp
@@ -23,6 +23,7 @@
 
 #include <istream>
 #include <boost/serialization/string.hpp>
+#include <boost/serialization/item_version_type.hpp>
 #include <boost/archive/archive_exception.hpp>
 #include <boost/archive/basic_binary_iprimitive.hpp>
 #include <boost/archive/detail/common_iarchive.hpp>
@@ -104,7 +105,26 @@ protected:
         boost::intmax_t l;
         load_impl(l, sizeof(T));
         // use cast to avoid compile time warning
-        t = static_cast<T>(l);
+        //t = static_cast<T>(l);
+        t = T(l);
+    }
+    void load(boost::serialization::item_version_type & t){
+        boost::intmax_t l;
+        load_impl(l, sizeof(boost::serialization::item_version_type));
+        // use cast to avoid compile time warning
+        t = boost::serialization::item_version_type(l);
+    }
+    void load(boost::archive::version_type & t){
+        boost::intmax_t l;
+        load_impl(l, sizeof(boost::archive::version_type));
+        // use cast to avoid compile time warning
+        t = boost::archive::version_type(l);
+    }
+    void load(boost::archive::class_id_type & t){
+        boost::intmax_t l;
+        load_impl(l, sizeof(boost::archive::class_id_type));
+        // use cast to avoid compile time warning
+        t = boost::archive::class_id_type(static_cast<int>(l));
     }
     void load(std::string & t){
         this->primitive_base_t::load(t);
diff --git a/example/portable_binary_oarchive.cpp b/example/portable_binary_oarchive.cpp
index 80799370..6f94eeb5 100644
--- a/example/portable_binary_oarchive.cpp
+++ b/example/portable_binary_oarchive.cpp
@@ -70,7 +70,7 @@ portable_binary_oarchive::init(unsigned int flags) {
         );
         * this << file_signature;
         // write library version
-        const boost::archive::version_type v(
+        const boost::archive::library_version_type v(
             boost::archive::BOOST_ARCHIVE_VERSION()
         );
         * this << v;
@@ -78,11 +78,16 @@ portable_binary_oarchive::init(unsigned int flags) {
     save(static_cast<unsigned char>(m_flags >> CHAR_BIT));
 }
 
+#include <boost/archive/impl/archive_serializer_map.ipp>
 #include <boost/archive/impl/basic_binary_oprimitive.ipp>
 
 namespace boost {
 namespace archive {
 
+namespace detail {
+    template class archive_serializer_map<portable_binary_oarchive>;
+}
+
 template class basic_binary_oprimitive<
     portable_binary_oarchive,
     std::ostream::char_type, 
diff --git a/example/simple_log_archive.hpp b/example/simple_log_archive.hpp
index d70b7cca..d7984bce 100644
--- a/example/simple_log_archive.hpp
+++ b/example/simple_log_archive.hpp
@@ -133,12 +133,13 @@ public:
     }
     template<class T, int N>
     simple_log_archive & operator<<(const T (&t)[N]){
-        ar << serialization::make_array(
-            static_cast<value_type const*>(&t[0]),count
+        return *this << boost::serialization::make_array(
+            static_cast<const T *>(&t[0]),
+            N
         );
     }
     template<class T>
-    simple_log_archive & operator<<(const ::boost::serialization::nvp<T> & t){
+    simple_log_archive & operator<<(const boost::serialization::nvp<T> & t){
         m_os << '\n'; // start line with each named object
         // indent according to object depth
         for(unsigned int i = 0; i < m_depth; ++i)
diff --git a/src/archive_exception.cpp b/src/archive_exception.cpp
index 08cbe480..589915c3 100644
--- a/src/archive_exception.cpp
+++ b/src/archive_exception.cpp
@@ -61,8 +61,8 @@ archive_exception::archive_exception(
     case array_size_too_short:
         m_msg = "array size too short";
         break;
-    case stream_error:
-        m_msg = "stream error";
+    case input_stream_error:
+        m_msg = "input stream error";
         break;
     case invalid_class_name:
         m_msg = "class name too long";
@@ -74,7 +74,8 @@ archive_exception::archive_exception(
         m_msg += (NULL != e2) ? e2 : "?";
         break;
     case unsupported_class_version:
-        m_msg = "class version";
+        m_msg = "class version ";
+        m_msg += (NULL != e1) ? e1 : "<unknown class>";
         break;
     case other_exception:
         // if get here - it indicates a derived exception 
@@ -88,6 +89,9 @@ archive_exception::archive_exception(
             m_msg += e1;
         }    
         break;
+    case output_stream_error:
+        m_msg = "output stream error";
+        break;
     default:
         assert(false);
         break;
diff --git a/src/basic_archive.cpp b/src/basic_archive.cpp
index a2a7d83e..92a7b1a4 100644
--- a/src/basic_archive.cpp
+++ b/src/basic_archive.cpp
@@ -53,15 +53,17 @@ BOOST_ARCHIVE_SIGNATURE(){
 // 2 - made address tracking optional
 // 3 - numerous changes - can't guarentee compatibility with previous versions
 // 4 - Boost 1.34
-//     added register_version to properly support versioning for collections 
+//     added item_version to properly support versioning for collections 
 // 5 - Boost 1.36
 //     changed serialization of collections: adding version even for primitive
 //     types caused backwards compatibility breaking change in 1.35
 // 6 - Boost 1.41, serializing collection sizes as std::size_t
+// 7 - separated version_type into library_version_type and class_version_type
+//     changed version_type to be stored as 8 bits.
 
-BOOST_ARCHIVE_DECL(version_type)
+BOOST_ARCHIVE_DECL(library_version_type)
 BOOST_ARCHIVE_VERSION(){
-    return version_type(7);
+    return library_version_type(7);
 }
 
 } // namespace archive
diff --git a/src/basic_iarchive.cpp b/src/basic_iarchive.cpp
index 50da890c..a1defa97 100644
--- a/src/basic_iarchive.cpp
+++ b/src/basic_iarchive.cpp
@@ -29,7 +29,6 @@ namespace std{
 #include <boost/serialization/tracking.hpp>
 
 #define BOOST_ARCHIVE_SOURCE
-#define BOOST_SERIALIZATION_SOURCE
 
 #include <boost/archive/archive_exception.hpp>
 
@@ -49,7 +48,7 @@ namespace detail {
 
 class basic_iarchive_impl {
     friend class basic_iarchive;
-    version_type m_archive_library_version;
+    library_version_type m_archive_library_version;
     unsigned int m_flags;
 
     //////////////////////////////////////////////////////////////////////
@@ -172,7 +171,7 @@ class basic_iarchive_impl {
         pending_version(0)
     {}
     ~basic_iarchive_impl(){}
-    void set_library_version(version_type archive_library_version){
+    void set_library_version(library_version_type archive_library_version){
         m_archive_library_version = archive_library_version;
     }
     bool
@@ -291,14 +290,7 @@ inline class_id_type
 basic_iarchive_impl::register_type(
     const basic_iserializer & bis
 ){
-    assert(
-        cobject_info_set.size() 
-        <= 
-        boost::integer_traits<class_id_type>::const_max
-    );
-    class_id_type cid(static_cast<class_id_type>(
-        cobject_info_set.size()
-    ));
+    class_id_type cid(cobject_info_set.size());
     cobject_type co(cid, bis);
     std::pair<cobject_info_set_type::const_iterator, bool>
         result = cobject_info_set.insert(co);
@@ -322,7 +314,7 @@ basic_iarchive_impl::load_preamble(
 ){
     if(! co.initialized){
         if(co.bis_ptr->class_info()){
-            class_id_optional_type cid;
+            class_id_optional_type cid(class_id_type(0));
             load(ar, cid);    // to be thrown away
             load(ar, co.tracking_level);
             load(ar, co.file_version);
@@ -382,7 +374,7 @@ basic_iarchive_impl::load_object(
 
     object_id_type this_id;
     moveable_objects_start =
-    this_id = object_id_vector.size();
+    this_id = object_id_type(object_id_vector.size());
 
     // if we tracked this object when the archive was saved
     if(tracking){ 
@@ -393,7 +385,7 @@ basic_iarchive_impl::load_object(
         // add a new enty into the tracking list
         object_id_vector.push_back(aobject(t, cid));
         // and add an entry for this object
-        moveable_objects_end = object_id_vector.size();
+        moveable_objects_end = object_id_type(object_id_vector.size());
     }
     // read data
     (bis.load_object_data)(ar, t, co.file_version);
@@ -418,11 +410,6 @@ basic_iarchive_impl::load_pointer(
         return bpis_ptr;
     }
 
-    assert(
-        cobject_info_set.size() 
-        <= 
-        boost::integer_traits<class_id_type>::const_max
-    );
     // if its a new class type - i.e. never been registered
     if(class_id_type(cobject_info_set.size()) <= cid){
         // if its either abstract
@@ -527,7 +514,7 @@ basic_iarchive::~basic_iarchive()
 }
 
 BOOST_ARCHIVE_DECL(void)
-basic_iarchive::set_library_version(version_type archive_library_version){
+basic_iarchive::set_library_version(library_version_type archive_library_version){
     pimpl->set_library_version(archive_library_version);
 }
 
@@ -571,7 +558,7 @@ basic_iarchive::delete_created_pointers()
     pimpl->delete_created_pointers();
 }
 
-BOOST_ARCHIVE_DECL(unsigned int) 
+BOOST_ARCHIVE_DECL(boost::archive::library_version_type) 
 basic_iarchive::get_library_version() const{
     return pimpl->m_archive_library_version;
 }
diff --git a/src/basic_oarchive.cpp b/src/basic_oarchive.cpp
index 21d4287c..7e098874 100644
--- a/src/basic_oarchive.cpp
+++ b/src/basic_oarchive.cpp
@@ -21,7 +21,6 @@
 // including this here to work around an ICC in intel 7.0
 // normally this would be part of basic_oarchive.hpp below.
 #define BOOST_ARCHIVE_SOURCE
-#define BOOST_SERIALIZATION_SOURCE
 
 #include <boost/archive/detail/decl.hpp>
 #include <boost/archive/basic_archive.hpp>
@@ -100,9 +99,7 @@ class basic_oarchive_impl {
             const basic_oserializer & bos
         ) :
             m_bos_ptr(& bos),
-            m_class_id(
-                static_cast<class_id_type>(class_id)
-            ),
+            m_class_id(class_id),
             m_initialized(false)
         {}
         cobject_type(const basic_oserializer & bos)
@@ -226,11 +223,6 @@ basic_oarchive_impl::find(const serialization::extended_type_info & ti) const {
 inline const basic_oarchive_impl::cobject_type &
 basic_oarchive_impl::find(const basic_oserializer & bos)
 {
-    assert(
-        cobject_info_set.size() 
-        <= 
-        boost::integer_traits<class_id_type>::const_max
-    );
     std::pair<cobject_info_set_type::iterator, bool> cresult = 
         cobject_info_set.insert(cobject_type(cobject_info_set.size(), bos));
     return *(cresult.first);
@@ -240,11 +232,6 @@ inline const basic_oarchive_impl::cobject_type &
 basic_oarchive_impl::register_type(
     const basic_oserializer & bos
 ){
-    assert(
-        cobject_info_set.size() 
-        <= 
-        boost::integer_traits<class_id_type>::const_max
-    );
     cobject_type co(cobject_info_set.size(), bos);
     std::pair<cobject_info_set_type::const_iterator, bool>
         result = cobject_info_set.insert(co);
@@ -446,7 +433,7 @@ basic_oarchive::register_basic_serializer(const basic_oserializer & bos){
     pimpl->register_type(bos);
 }
 
-BOOST_ARCHIVE_DECL(unsigned int)
+BOOST_ARCHIVE_DECL(library_version_type)
 basic_oarchive::get_library_version() const{
     return BOOST_ARCHIVE_VERSION();
 }
diff --git a/src/basic_serializer_map.cpp b/src/basic_serializer_map.cpp
index 429f3a45..cf5917f9 100644
--- a/src/basic_serializer_map.cpp
+++ b/src/basic_serializer_map.cpp
@@ -94,7 +94,10 @@ basic_serializer_map::find(
     const basic_serializer_arg bs(eti);
     map_type::const_iterator it;
     it = m_map.find(& bs);
-    assert(it != m_map.end());
+    if(it == m_map.end()){
+        assert(false);
+        return 0;
+    }
     return *it;
 }
 
diff --git a/src/basic_xml_grammar.ipp b/src/basic_xml_grammar.ipp
index 0d7682bb..312cd526 100644
--- a/src/basic_xml_grammar.ipp
+++ b/src/basic_xml_grammar.ipp
@@ -181,7 +181,7 @@ bool basic_xml_grammar<CharType>::my_parse(
 ) const {
     if(is.fail()){
         boost::serialization::throw_exception(
-            archive_exception(archive_exception::stream_error)
+            archive_exception(archive_exception::input_stream_error)
         );
     }
     
@@ -321,7 +321,7 @@ basic_xml_grammar<CharType>::basic_xml_grammar(){
         str_p(BOOST_ARCHIVE_XML_CLASS_ID()) >> NameTail
         >> Eq 
         >> L'"'
-        >> int_p [xml::assign_object(rv.class_id.t)]
+        >> int_p [xml::assign_object(rv.class_id)]
         >> L'"'
       ;
 
@@ -334,7 +334,7 @@ basic_xml_grammar<CharType>::basic_xml_grammar(){
         >> Eq 
         >> L'"'
         >> L'_'
-        >> uint_p [xml::assign_object(rv.object_id.t)]
+        >> uint_p [xml::assign_object(rv.object_id)]
         >> L'"'
     ;
         
@@ -372,7 +372,7 @@ basic_xml_grammar<CharType>::basic_xml_grammar(){
         str_p(BOOST_ARCHIVE_XML_VERSION())
         >> Eq
         >> L'"'
-        >> uint_p [xml::assign_object(rv.version.t)]
+        >> uint_p [xml::assign_object(rv.version)]
         >> L'"'
     ;
 
diff --git a/src/extended_type_info_typeid.cpp b/src/extended_type_info_typeid.cpp
index 8b5e38d6..6e62b40d 100644
--- a/src/extended_type_info_typeid.cpp
+++ b/src/extended_type_info_typeid.cpp
@@ -72,7 +72,7 @@ extended_type_info_typeid_0::is_equal(
 
 BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())
 extended_type_info_typeid_0::extended_type_info_typeid_0(
-	const char * key
+    const char * key
 ) :
     extended_type_info(EXTENDED_TYPE_INFO_TYPE_KEY, key),
     m_ti(NULL)
diff --git a/src/void_cast.cpp b/src/void_cast.cpp
index ef8aa767..52e22b97 100644
--- a/src/void_cast.cpp
+++ b/src/void_cast.cpp
@@ -28,8 +28,6 @@
 // BOOST
 #define BOOST_SERIALIZATION_SOURCE
 #include <boost/serialization/singleton.hpp>
-
-#define BOOST_SERIALIZATION_SOURCE
 #include <boost/serialization/extended_type_info.hpp>
 #include <boost/serialization/void_cast.hpp>
 
@@ -100,6 +98,9 @@ class void_caster_shortcut : public void_caster
     virtual bool is_shortcut() const {
         return true;
     }
+    virtual bool has_virtual_base() const {
+        return m_includes_virtual_base;
+    }
 public:
     void_caster_shortcut(
         extended_type_info const * derived,
@@ -192,6 +193,10 @@ class void_caster_argument : public void_caster
         assert(false);
         return NULL;
     }
+    virtual bool has_virtual_base() const {
+        assert(false);
+        return false;
+    }
 public:
     void_caster_argument(
         extended_type_info const * derived,
@@ -239,7 +244,7 @@ void_caster::recursive_register(bool includes_virtual_base) const {
                     (*it)->m_derived, 
                     m_base,
                     m_difference + (*it)->m_difference,
-                    includes_virtual_base,
+                    (*it)->has_virtual_base() || includes_virtual_base,
                     this
                 );
             }
@@ -256,7 +261,7 @@ void_caster::recursive_register(bool includes_virtual_base) const {
                     m_derived, 
                     (*it)->m_base, 
                     m_difference + (*it)->m_difference,
-                    includes_virtual_base,
+                    (*it)->has_virtual_base() || includes_virtual_base,
                     this
                 );
             }
@@ -284,10 +289,6 @@ void_caster::recursive_unregister() const {
     void_cast_detail::set_type::iterator it;
     for(it = s.begin(); it != s.end();){
         const void_caster * vc = *it;
-        if(vc == this){
-            s.erase(it++);
-        }
-        else
         if(vc->m_parent == this){
             s.erase(it);
             delete vc;
@@ -296,6 +297,11 @@ void_caster::recursive_unregister() const {
         else
             it++;
     }
+
+    // delete this guy if he's in there
+    it = s.find(this);
+    if(it != s.end())
+        s.erase(it);
 }
 
 } // namespace void_cast_detail
diff --git a/test/A.hpp b/test/A.hpp
index 25ea5f47..bf2a6e8c 100644
--- a/test/A.hpp
+++ b/test/A.hpp
@@ -145,6 +145,7 @@ private:
     #endif
 public:
     A();
+    bool check_equal(const A &rhs) const;
     bool operator==(const A &rhs) const;
     bool operator!=(const A &rhs) const;
     bool operator<(const A &rhs) const; // used by less
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index b3cd5981..3ed06ee8 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -71,6 +71,7 @@ test-suite "serialization" :
      [ test-bsl-run_files test_derived_class : A ]
      [ test-bsl-run_files test_derived_class_ptr : A ]
      [ test-bsl-run_files test_diamond ]
+     [ test-bsl-run_files test_diamond_complex ]
      [ test-bsl-run_files test_exported : polymorphic_base ]
      [ test-bsl-run_files test_class_info_load ]
      [ test-bsl-run_files test_class_info_save ]
diff --git a/test/test_class_info_save.cpp b/test/test_class_info_save.cpp
index dabd8faa..dc02876c 100644
--- a/test/test_class_info_save.cpp
+++ b/test/test_class_info_save.cpp
@@ -52,7 +52,10 @@ class B
     template<class Archive>
     void serialize(Archive & /*ar*/, const unsigned int file_version){
         // verify at execution that correct version number is passed on save
-        BOOST_CHECK(file_version == ::boost::serialization::version<B>::value);
+        BOOST_CHECK(
+            static_cast<const int>(file_version) 
+            == ::boost::serialization::version<B>::value
+        );
         ++count;
     }
 public:
diff --git a/test/test_dll_plugin.cpp b/test/test_dll_plugin.cpp
index 19dd603b..f2219da1 100644
--- a/test/test_dll_plugin.cpp
+++ b/test/test_dll_plugin.cpp
@@ -1,5 +1,5 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// test_plugin.cpp
+// test_dll_plugin.cpp
 
 // (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 
 // Use, modification and distribution is subject to the Boost Software
@@ -155,6 +155,7 @@ void load_exported(const char *testfile)
 #ifdef BOOST_WINDOWS
 
 #define WIN32_LEAN_AND_MEAN
+#include <TCHAR.H>
 #include <windows.h>
 
 int
@@ -164,8 +165,11 @@ test_main( int /* argc */, char* /* argv */[] )
     BOOST_REQUIRE(NULL != testfile);
 
     HINSTANCE hDLL;               // Handle to DLL
-    hDLL = LoadLibrary("plugin_polymorphic_derived2.dll");
-    BOOST_CHECK_MESSAGE((0 != hDLL), "Failed to find/load plugin_polymorphic_derived2" );
+    hDLL = LoadLibrary(_T("plugin_polymorphic_derived2.dll"));
+    BOOST_CHECK_MESSAGE(
+        (0 != hDLL), 
+        "Failed to find/load plugin_polymorphic_derived2"
+    );
     if(0 == hDLL)
         return EXIT_FAILURE;
 
diff --git a/test/test_no_rtti.cpp b/test/test_no_rtti.cpp
index 99ce1f51..96bd0143 100644
--- a/test/test_no_rtti.cpp
+++ b/test/test_no_rtti.cpp
@@ -26,9 +26,6 @@ namespace std{
 }
 #endif
 
-#include <boost/static_assert.hpp>
-#include <boost/type_traits/is_same.hpp>
-
 #include <boost/archive/archive_exception.hpp>
 
 #include <boost/serialization/type_info_implementation.hpp>
diff --git a/test/test_simple_class.cpp b/test/test_simple_class.cpp
index 30a9e699..d6e5693f 100644
--- a/test/test_simple_class.cpp
+++ b/test/test_simple_class.cpp
@@ -13,6 +13,7 @@
 #include <cstddef> // NULL
 #include <cstdio> // remove
 #include <fstream>
+#include <cmath>
 
 #include <boost/config.hpp>
 
@@ -27,6 +28,48 @@ namespace std{
 #include "A.hpp"
 #include "A.ipp"
 
+bool A::check_equal(const A &rhs) const
+{
+    BOOST_CHECK_EQUAL(b, rhs.b);
+    BOOST_CHECK_EQUAL(l, rhs.l);
+    #ifndef BOOST_NO_INT64_T
+    BOOST_CHECK_EQUAL(f, rhs.f);
+    BOOST_CHECK_EQUAL(g, rhs.g);
+    #endif
+    BOOST_CHECK_EQUAL(m, rhs.m);
+    BOOST_CHECK_EQUAL(n, rhs.n);
+    BOOST_CHECK_EQUAL(o, rhs.o);
+    BOOST_CHECK_EQUAL(p, rhs.p);
+    BOOST_CHECK_EQUAL(q, rhs.q);
+    #ifndef BOOST_NO_CWCHAR
+    BOOST_CHECK_EQUAL(r, rhs.r);
+    #endif
+    BOOST_CHECK_EQUAL(c, rhs.c);
+    BOOST_CHECK_EQUAL(s, rhs.s);
+    BOOST_CHECK_EQUAL(t, rhs.t);
+    BOOST_CHECK_EQUAL(u, rhs.u);
+    BOOST_CHECK_EQUAL(v, rhs.v);
+    BOOST_CHECK_EQUAL(l, rhs.l);
+    BOOST_CHECK(!(
+        w == 0 
+        && std::fabs(rhs.w) > std::numeric_limits<float>::epsilon()
+    ));
+    BOOST_CHECK(!(
+        std::fabs(rhs.w/w - 1.0) > std::numeric_limits<float>::epsilon()
+    ));
+    BOOST_CHECK(!(
+        x == 0 && std::fabs(rhs.x - x) > std::numeric_limits<float>::epsilon()
+    ));
+    BOOST_CHECK(!(
+        std::fabs(rhs.x/x - 1.0) > std::numeric_limits<float>::epsilon()
+    ));
+    BOOST_CHECK(!(0 != y.compare(rhs.y)));
+    #ifndef BOOST_NO_STD_WSTRING
+    BOOST_CHECK(!(0 != z.compare(rhs.z)));
+    #endif      
+    return true;
+}
+
 int 
 test_main( int /* argc */, char* /* argv */[] )
 {
@@ -44,7 +87,7 @@ test_main( int /* argc */, char* /* argv */[] )
         test_iarchive ia(is, TEST_ARCHIVE_FLAGS);
         ia >> boost::serialization::make_nvp("a", a1);
     }
-    BOOST_CHECK_EQUAL(a, a1);
+    a.check_equal(a1);
     std::remove(testfile);
     return 0;
 }
diff --git a/vc7ide/BoostSerializationLibrary.sln b/vc7ide/BoostSerializationLibrary.sln
index d572b319..9d79d399 100644
--- a/vc7ide/BoostSerializationLibrary.sln
+++ b/vc7ide/BoostSerializationLibrary.sln
@@ -231,6 +231,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_private_base", "test_p
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_zmisc", "test_zmisc.vcproj", "{FF315430-555F-44D8-9EA0-587AF1479020}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shared_ptr_multi_base", "test_shared_ptr_multi_base.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
@@ -295,6 +299,74 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo", "demo.vcproj", "{A7D
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_list", "test_list.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_binary", "test_binary.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_class_info_load", "test_class_info_load.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_class_info_save", "test_class_info_save.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_contained_class", "test_contained_class.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_cyclic_ptrs", "test_cyclic_ptrs.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_delete_pointer", "test_delete_pointer.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_deque", "test_deque.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_derived_class_ptr", "test_derived_class_ptr.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_diamond", "test_diamond.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_iterators", "test_iterators.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_iterators_base64", "test_iterators_base64.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_list_ptrs", "test_list_ptrs.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_mult_archive_types", "test_mult_archive_types.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_singleton", "test_singleton.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_smart_cast", "test_smart_cast.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_diamond_complex", "test_diamond_complex.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -446,20 +518,20 @@ Global
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static|Win32
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-dynamic|Win32
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1118,6 +1190,20 @@ Global
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+		{FF315430-555F-44D8-9EA0-587AF1479020}.Debug.ActiveCfg = Debug runtime-static|Win32
+		{FF315430-555F-44D8-9EA0-587AF1479020}.Debug.Build.0 = Debug runtime-static|Win32
+		{FF315430-555F-44D8-9EA0-587AF1479020}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{FF315430-555F-44D8-9EA0-587AF1479020}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{FF315430-555F-44D8-9EA0-587AF1479020}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{FF315430-555F-44D8-9EA0-587AF1479020}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{FF315430-555F-44D8-9EA0-587AF1479020}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static|Win32
+		{FF315430-555F-44D8-9EA0-587AF1479020}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static|Win32
+		{FF315430-555F-44D8-9EA0-587AF1479020}.Release.ActiveCfg = Debug runtime-static|Win32
+		{FF315430-555F-44D8-9EA0-587AF1479020}.Release.Build.0 = Debug runtime-static|Win32
+		{FF315430-555F-44D8-9EA0-587AF1479020}.Release runtime-dynamic.ActiveCfg = Debug runtime-static|Win32
+		{FF315430-555F-44D8-9EA0-587AF1479020}.Release runtime-dynamic.Build.0 = Debug runtime-static|Win32
+		{FF315430-555F-44D8-9EA0-587AF1479020}.Release runtime-static.ActiveCfg = Release runtime-dynamic|Win32
+		{FF315430-555F-44D8-9EA0-587AF1479020}.Release runtime-static.Build.0 = Release runtime-dynamic|Win32
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1342,6 +1428,244 @@ Global
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
 		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
 	EndGlobalSection
 	GlobalSection(SolutionItems) = postSolution
 		..\test\Jamfile.v2 = ..\test\Jamfile.v2
diff --git a/vc7ide/Library.vcproj b/vc7ide/Library.vcproj
index 7fbb6290..310d425e 100644
--- a/vc7ide/Library.vcproj
+++ b/vc7ide/Library.vcproj
@@ -44,7 +44,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(ConfigurationName)\boost_serialization-vc71-mt-gd-1_42.dll"
+				OutputFile="$(ConfigurationName)\boost_serialization-vc71-mt-gd-1_44.dll"
 				GenerateDebugInformation="TRUE"
 				GenerateMapFile="TRUE"/>
 			<Tool
@@ -95,7 +95,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(ConfigurationName)\boost_serialization-vc71-mt-1_42.dll"
+				OutputFile="$(ConfigurationName)\boost_serialization-vc71-mt-1_44.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
@@ -155,7 +155,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(ConfigurationName)\libboost_serialization-vc71-mt-sgd-1_42.lib"/>
+				OutputFile="$(ConfigurationName)\libboost_serialization-vc71-mt-sgd-1_44.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
@@ -208,7 +208,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/libboost_serialization-vc71-s-1_39.lib"/>
+				OutputFile="$(OutDir)/libboost_serialization-vc71-s-1_44.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
@@ -296,6 +296,9 @@
 			<File
 				RelativePath="..\..\..\boost\serialization\bitset.hpp">
 			</File>
+			<File
+				RelativePath="..\..\..\boost\serialization\collection_size_type.hpp">
+			</File>
 			<File
 				RelativePath="..\..\..\boost\serialization\collection_traits.hpp">
 			</File>
@@ -326,6 +329,9 @@
 			<File
 				RelativePath="..\..\..\boost\serialization\is_bitwise_serializable.hpp">
 			</File>
+			<File
+				RelativePath="..\..\..\boost\serialization\item_version_type.hpp">
+			</File>
 			<File
 				RelativePath="..\..\..\boost\serialization\list.hpp">
 			</File>
@@ -359,6 +365,9 @@
 			<File
 				RelativePath="..\..\..\boost\serialization\utility.hpp">
 			</File>
+			<File
+				RelativePath="..\..\..\boost\serialization\valarray.hpp">
+			</File>
 			<File
 				RelativePath="..\..\..\boost\serialization\variant.hpp">
 			</File>
@@ -507,9 +516,6 @@
 			<File
 				RelativePath="..\..\..\boost\archive\codecvt_null.hpp">
 			</File>
-			<File
-				RelativePath="..\..\..\boost\serialization\collection_size_type.hpp">
-			</File>
 			<File
 				RelativePath="..\..\..\boost\serialization\config.hpp">
 			</File>
diff --git a/vc7ide/LibraryW.vcproj b/vc7ide/LibraryW.vcproj
index 61914327..e6fa0510 100644
--- a/vc7ide/LibraryW.vcproj
+++ b/vc7ide/LibraryW.vcproj
@@ -43,8 +43,8 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="boost_serialization-vc71-mt-gd-1_42.lib"
-				OutputFile="$(ConfigurationName)\boost_wserialization-vc71-mt-gd-1_42.dll"
+				AdditionalDependencies="boost_serialization-vc71-mt-gd-1_44.lib"
+				OutputFile="$(ConfigurationName)\boost_wserialization-vc71-mt-gd-1_44.dll"
 				AdditionalLibraryDirectories="$(ConfigurationName)"
 				GenerateDebugInformation="TRUE"
 				SupportUnloadOfDelayLoadedDLL="FALSE"/>
@@ -102,7 +102,8 @@
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCLinkerTool"/>
+				Name="VCLinkerTool"
+				OutputFile="$(ConfigurationName)\boost_wserialization-vc71-mt-1_44.dll"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
@@ -155,7 +156,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)"/>
+				OutputFile="$(ConfigurationName)\libboost_wserialization-vc71-mt-sgd-1_44.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
@@ -207,7 +208,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)"/>
+				OutputFile="$(OutDir)/libboost_wserialization-vc71-s-1_44.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
@@ -260,7 +261,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)"/>
+				OutputFile="$(OutDir)/libboost_serialization-vc71-s-1_44.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
@@ -311,7 +312,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(ConfigurationName)\libboost_wserialization-vc71-mt-sgd-1_41.lib"/>
+				OutputFile="$(ConfigurationName)\libboost_wserialization-vc71-mt-sgd-1_44.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
diff --git a/vc7ide/test_array.vcproj b/vc7ide/test_array.vcproj
index 03b5b815..74b83128 100644
--- a/vc7ide/test_array.vcproj
+++ b/vc7ide/test_array.vcproj
@@ -1762,7 +1762,7 @@
 				Optimization="0"
 				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=binary_archive.hpp"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=text_warchive.hpp"
 				BasicRuntimeChecks="0"
 				SmallerTypeCheck="FALSE"
 				RuntimeLibrary="3"
@@ -1770,6 +1770,7 @@
 				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				WarningLevel="4"
+				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="1"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
diff --git a/vc7ide/test_class_info_load.vcproj b/vc7ide/test_class_info_load.vcproj
index 9ed49ad9..4b025377 100644
--- a/vc7ide/test_class_info_load.vcproj
+++ b/vc7ide/test_class_info_load.vcproj
@@ -79,7 +79,7 @@
 				Optimization="0"
 				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=xml_warchive.hpp"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=text_warchive.hpp"
 				SmallerTypeCheck="TRUE"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
diff --git a/vc7ide/test_class_info_save.vcproj b/vc7ide/test_class_info_save.vcproj
index af08fead..2eed186b 100644
--- a/vc7ide/test_class_info_save.vcproj
+++ b/vc7ide/test_class_info_save.vcproj
@@ -79,7 +79,7 @@
 				Optimization="0"
 				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=text_warchive.hpp"
 				SmallerTypeCheck="TRUE"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
diff --git a/vc7ide/test_delete_pointer.vcproj b/vc7ide/test_delete_pointer.vcproj
index 9fe90a3a..16595818 100644
--- a/vc7ide/test_delete_pointer.vcproj
+++ b/vc7ide/test_delete_pointer.vcproj
@@ -88,7 +88,7 @@
 				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="FALSE"
+				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="1"
 				CompileAs="0"/>
 			<Tool
diff --git a/vc7ide/test_diamond_complex.vcproj b/vc7ide/test_diamond_complex.vcproj
new file mode 100644
index 00000000..8b1b536e
--- /dev/null
+++ b/vc7ide/test_diamond_complex.vcproj
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="test_diamond_complex"
+	ProjectGUID="{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	RootNamespace="test_diamond_complex"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release runtime-dynamic|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="TRUE"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
+				SmallerTypeCheck="FALSE"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="$(ConfigurationName)"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=xml_warchive.hpp"
+				SmallerTypeCheck="TRUE"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				EnableFunctionLevelLinking="FALSE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="$(ConfigurationName)"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug runtime-static|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1"
+				SmallerTypeCheck="TRUE"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="TRUE"
+				EnableFunctionLevelLinking="FALSE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				AdditionalDependencies="Library"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="$(ConfigurationName)"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\test\test_diamond_complex.cpp">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/vc7ide/test_optional.vcproj b/vc7ide/test_optional.vcproj
index eefc40f2..c1297914 100644
--- a/vc7ide/test_optional.vcproj
+++ b/vc7ide/test_optional.vcproj
@@ -79,7 +79,7 @@
 				Optimization="0"
 				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=xml_archive.hpp"
 				SmallerTypeCheck="TRUE"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
diff --git a/vc7ide/test_polymorphic.vcproj b/vc7ide/test_polymorphic.vcproj
index 3e2cd811..018083ab 100644
--- a/vc7ide/test_polymorphic.vcproj
+++ b/vc7ide/test_polymorphic.vcproj
@@ -79,7 +79,7 @@
 				Optimization="0"
 				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=polymorphic_text_archive.hpp"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=polymorphic_xml_warchive.hpp"
 				SmallerTypeCheck="TRUE"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
diff --git a/vc7ide/test_simple_class.vcproj b/vc7ide/test_simple_class.vcproj
index 6fd4663b..7bb67565 100644
--- a/vc7ide/test_simple_class.vcproj
+++ b/vc7ide/test_simple_class.vcproj
@@ -25,9 +25,9 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="TRUE"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
 				SmallerTypeCheck="FALSE"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				BufferSecurityCheck="FALSE"
 				EnableFunctionLevelLinking="TRUE"
 				TreatWChar_tAsBuiltInType="TRUE"
@@ -79,7 +79,7 @@
 				Optimization="2"
 				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=text_archive.hpp"
 				SmallerTypeCheck="FALSE"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
@@ -180,59 +180,6 @@
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
-		<Configuration
-			Name="Release runtime-dynamic|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
-				SmallerTypeCheck="FALSE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="TRUE"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="$(ConfigurationName)"
-				GenerateDebugInformation="TRUE"
-				SubSystem="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="run $(TargetName) with $(ConfigurationName)"
-				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
 	</Configurations>
 	<References>
 	</References>
diff --git a/vc7ide/test_vector.vcproj b/vc7ide/test_vector.vcproj
index 3692d4af..606074ad 100644
--- a/vc7ide/test_vector.vcproj
+++ b/vc7ide/test_vector.vcproj
@@ -79,7 +79,7 @@
 				Optimization="0"
 				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=text_archive.hpp"
 				SmallerTypeCheck="TRUE"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"