BIND 10 trac2117, updated. f466fd981273ec9f09b3761da1fc30eb9e325598 add PARTIAL_PORT_ON_WINDOWS to lib/dhcp

Wed Aug 1 21:54:20 UTC 2012

The branch, trac2117 has been updated
       via  f466fd981273ec9f09b3761da1fc30eb9e325598 (commit)
       via  c22703f7e96e5ec27b9cf7b9cdfbf67ebddeaa51 (commit)
      from  b4fbe6a443dd81632af7dc2920d9125eea5c0986 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f466fd981273ec9f09b3761da1fc30eb9e325598
Author: Francis Dupont <fdupont at isc.org>
Date:   Wed Aug 1 23:54:10 2012 +0200

    add PARTIAL_PORT_ON_WINDOWS to lib/dhcp

commit c22703f7e96e5ec27b9cf7b9cdfbf67ebddeaa51
Author: Francis Dupont <fdupont at isc.org>
Date:   Wed Aug 1 23:53:35 2012 +0200

    synchronize local and remote repos

-----------------------------------------------------------------------

Summary of changes:
 WIN32-NOTES                                        |    5 +-
 src/lib/datasrc/datasrc_config.h.pre.win32         |    2 +-
 src/lib/datasrc/factory.cc                         |   36 ++++++------
 src/lib/datasrc/logger.cc                          |    3 +-
 src/lib/datasrc/logger.h                           |    2 +-
 src/lib/datasrc/tests/cache_unittest.cc            |    2 +
 src/lib/datasrc/tests/client_list_unittest.cc      |    2 +
 src/lib/datasrc/tests/client_unittest.cc           |    2 +
 src/lib/datasrc/tests/database_unittest.cc         |    2 +
 src/lib/datasrc/tests/datasrc_unittest.cc          |    2 +
 src/lib/datasrc/tests/factory_unittest.cc          |   61 +++++++++++++++++++-
 src/lib/datasrc/tests/faked_nsec3.cc               |    2 +
 src/lib/datasrc/tests/logger_unittest.cc           |    2 +
 src/lib/datasrc/tests/memory_datasrc_unittest.cc   |    2 +
 src/lib/datasrc/tests/query_unittest.cc            |    2 +
 src/lib/datasrc/tests/rbnode_rrset_unittest.cc     |    2 +
 src/lib/datasrc/tests/rbtree_unittest.cc           |    2 +
 src/lib/datasrc/tests/sqlite3_accessor_unittest.cc |    2 +
 src/lib/datasrc/tests/sqlite3_unittest.cc          |    2 +
 src/lib/datasrc/tests/static_unittest.cc           |    2 +
 src/lib/datasrc/tests/test_client.cc               |    2 +
 src/lib/datasrc/tests/test_datasrc.cc              |    2 +
 .../datasrc/tests/zone_finder_context_unittest.cc  |    2 +
 src/lib/datasrc/tests/zonetable_unittest.cc        |    2 +
 src/lib/dhcp/tests/iface_mgr_unittest.cc           |   32 +++++++---
 .../isc/util/cio/socketsessionforwarder_python.cc  |    4 +-
 src/lib/server_common/socket_request.h             |    4 +-
 src/lib/util/io/fd.cc                              |    2 +
 src/lib/util/io/fdshare_python.cc                  |    8 +++
 src/lib/util/io/sockaddr_util.h                    |   30 ++++++++++
 tests/tools/badpacket/command_options.cc           |    4 ++
 win32build/VS2010/bind10.sln                       |   19 ++++++
 win32build/VS2010/libacl/libacl.vcxproj            |    6 +-
 win32build/VS2010/libasiodns/libasiodns.vcxproj    |    6 +-
 win32build/VS2010/libasiolink/libasiolink.vcxproj  |    6 +-
 win32build/VS2010/libbench/libbench.vcxproj        |    6 +-
 win32build/VS2010/libcache/libcache.vcxproj        |    6 +-
 win32build/VS2010/libcc/libcc.vcxproj              |    6 +-
 .../VS2010/libcfgclient/libcfgclient.vcxproj       |    6 +-
 .../VS2010/libcryptolink/libcryptolink.vcxproj     |    6 +-
 win32build/VS2010/libdatasrc/libdatasrc.vcxproj    |   22 +++----
 .../VS2010/libdatasrc/libdatasrc.vcxproj.filters   |   24 ++++++--
 .../libdatasrc_memory/libdatasrc_memory.vcxproj    |    2 +-
 .../libdatasrc_memory.vcxproj.filters              |   12 ++--
 .../libdatasrc_sqlite3/libdatasrc_sqlite3.vcxproj  |    3 +-
 .../libdatasrc_sqlite3.vcxproj.filters             |    9 +--
 .../libdatasrc_static/libdatasrc_static.vcxproj    |    3 +-
 .../libdatasrc_static.vcxproj.filters              |   19 +++---
 .../libdatasrc_tests/libdatasrc_tests.vcxproj      |   15 +++--
 .../libdatasrc_tests.vcxproj.filters               |   27 ++++++++-
 win32build/VS2010/libdhcp/libdhcp.vcxproj          |    6 +-
 win32build/VS2010/libdns++/libdns++.vcxproj        |    6 +-
 win32build/VS2010/libdnsacl/libdnsacl.vcxproj      |    6 +-
 .../VS2010/libexceptions/libexceptions.vcxproj     |    6 +-
 .../VS2010/libfake_session/libfake_session.vcxproj |    6 +-
 win32build/VS2010/liblog/liblog.vcxproj            |    6 +-
 win32build/VS2010/libnsas/libnsas.vcxproj          |    6 +-
 win32build/VS2010/libresolve/libresolve.vcxproj    |    6 +-
 .../libserver_common/libserver_common.vcxproj      |    6 +-
 .../VS2010/libstatistics/libstatistics.vcxproj     |    6 +-
 .../VS2010/libtestutils/libtestutils.vcxproj       |    6 +-
 win32build/VS2010/libutil/libutil.vcxproj          |    6 +-
 win32build/VS2010/libutil_io/libutil_io.vcxproj    |    6 +-
 .../libutil_unittests/libutil_unittests.vcxproj    |    6 +-
 win32build/VS2010/libxfr/libxfr.vcxproj            |    6 +-
 win32build/VS2010/pydacl/pydacl.vcxproj            |    4 +-
 win32build/VS2010/pyddatasrc/pyddatasrc.vcxproj    |    4 +-
 win32build/VS2010/pyddns++/pyddns++.vcxproj        |    4 +-
 win32build/VS2010/pyddnsacl/pyddnsacl.vcxproj      |    4 +-
 win32build/VS2010/pydlog/pydlog.vcxproj            |    4 +-
 win32build/VS2010/pydutil_io/pydutil_io.vcxproj    |    4 +-
 71 files changed, 328 insertions(+), 218 deletions(-)

-----------------------------------------------------------------------

diff --git a/WIN32-NOTES b/WIN32-NOTES
index e47d950..38e02de 100644
--- a/WIN32-NOTES
+++ b/WIN32-NOTES
@@ -8,8 +8,9 @@ What is needed:
  - Visual Studio C++ (versions 2008 and 2010 were tested,
   (note older versions could fail to correctly compile,
   cf. C4373 warning), 2010 express and 64 bit support
-  from the 7.1 SDK work too. 2012 RC can't compile gtest
-  with its standard environment...)
+  from the 7.1 SDK work too. VS 2012 RC can't compile gtest
+  with its standard environment... but the issue is known:
+  http://code.google.com/p/googletest/issues/detail?id=412
 
  - python >= 3.1 (I got Cpython 3.2 MSI from python.org,
   note the pre-built python can give C++ runtime issue with
diff --git a/src/lib/datasrc/datasrc_config.h.pre.win32 b/src/lib/datasrc/datasrc_config.h.pre.win32
index 9074df6..3e05ee5 100644
--- a/src/lib/datasrc/datasrc_config.h.pre.win32
+++ b/src/lib/datasrc/datasrc_config.h.pre.win32
@@ -23,7 +23,7 @@ namespace datasrc {
 /// such as memory_ds.so and sqlite3_ds.so are found. It is used by the
 /// DataSourceClient loader if no absolute path is used and
 /// B10_FROM_BUILD is not set in the environment.
-const char* const BACKEND_LIBRARY_PATH = "@@PKGLIBDIR@@/";
+const char* const BACKEND_LIBRARY_PATH = PKGLIBDIR;
 
 } // end namespace datasrc
 } // end namespace isc
diff --git a/src/lib/datasrc/factory.cc b/src/lib/datasrc/factory.cc
index 03c34d0..f9c26a6 100644
--- a/src/lib/datasrc/factory.cc
+++ b/src/lib/datasrc/factory.cc
@@ -62,35 +62,34 @@ getDataSourceLibFile(const std::string& type) {
     std::string lib_file = type;
     const int ext_pos = lib_file.rfind(".so");
     if (ext_pos == std::string::npos || ext_pos + 3 != lib_file.length()) {
+#if !defined(_WIN32) || !defined(_DEBUG)
         lib_file.append("_ds.so");
+#else
+        lib_file.append("_dsD.so");
+#endif
     }
-#ifndef _WIN32
     // And if it is not an absolute path, prepend it with our
     // loadable backend library path
     if (type[0] != '/') {
         // When running from the build tree, we do NOT want
         // to load the installed loadable library
         if (getenv("B10_FROM_BUILD") != NULL) {
+#ifndef _WIN32
             lib_file = std::string(getenv("B10_FROM_BUILD")) +
                        "/src/lib/datasrc/.libs/" + lib_file;
-        } else {
-            lib_file = isc::datasrc::BACKEND_LIBRARY_PATH + lib_file;
-        }
-    }
 #else
-    // And if it is not an absolute path, prepend it with our
-    // loadable backend library path
-    if (type[0] != '\\') {
-        // When running from the build tree, we do NOT want
-        // to load the installed loadable library
-        if (getenv("B10_FROM_BUILD") != NULL) {
+#ifndef _DEBUG
             lib_file = std::string(getenv("B10_FROM_BUILD")) +
-                       "\\win32build\\VS2010\\Release\\" + lib_file;
+                       "/win32build/VS2010/Release/" + lib_file;
+#else
+            lib_file = std::string(getenv("B10_FROM_BUILD")) +
+                       "/win32build/VS2010/Debug/" + lib_file;
+#endif
+#endif
         } else {
             lib_file = isc::datasrc::BACKEND_LIBRARY_PATH + lib_file;
         }
     }
-#endif
     return (lib_file);
 }
 } // end anonymous namespace
@@ -113,15 +112,18 @@ LibraryContainer::LibraryContainer(const std::string& name) {
 #ifndef USE_STATIC_LINK
     ds_lib_ = LoadLibraryA(name.c_str());
     if (ds_lib_ == NULL) {
-        isc_throw(DataSourceLibraryError, "dLoadLibrary failed for " << name <<
+        isc_throw(DataSourceLibraryError, "LoadLibrary failed for " << name <<
                                           ": " << strerror(GetLastError()));
     }
 #else
-    if (strcmp(name.c_str(), "sqlite3_ds.so") == 0)
+    if ((strcmp(name.c_str(), "sqlite3_ds.so") == 0) ||
+        (strcmp(name.c_str(), "sqlite3_dsD.so") == 0))
         ds_lib_ = 1;
-    else if (strcmp(name.c_str(), "memory_ds.so") == 0)
+    else if ((strcmp(name.c_str(), "memory_ds.so") == 0) ||
+             (strcmp(name.c_str(), "memory_dsD.so") == 0))
         ds_lib_ = 2;
-    else if (strcmp(name.c_str(), "static_ds.so") == 0)
+    else if ((strcmp(name.c_str(), "static_ds.so") == 0) ||
+             (strcmp(name.c_str(), "static_dsD.so") == 0))
         ds_lib_ = 3;
     else {
         isc_throw(DataSourceLibraryError,
diff --git a/src/lib/datasrc/logger.cc b/src/lib/datasrc/logger.cc
index 48ab9c9..a695bad 100644
--- a/src/lib/datasrc/logger.cc
+++ b/src/lib/datasrc/logger.cc
@@ -19,7 +19,8 @@
 namespace isc {
 namespace datasrc {
 
-ISC_LIBDATASRC_API isc::log::Logger logger("datasrc");
+// shared on name by log4cplus
+isc::log::Logger logger("datasrc");
 
 }
 }
diff --git a/src/lib/datasrc/logger.h b/src/lib/datasrc/logger.h
index 6e72e77..0ead6bf 100644
--- a/src/lib/datasrc/logger.h
+++ b/src/lib/datasrc/logger.h
@@ -30,7 +30,7 @@ namespace isc {
 namespace datasrc {
 
 /// \brief The logger for this library
-extern ISC_LIBDATASRC_API isc::log::Logger logger;
+extern isc::log::Logger logger;
 
 /// \brief Trace basic operations
 const int DBG_TRACE_BASIC = DBGLVL_TRACE_BASIC;
diff --git a/src/lib/datasrc/tests/cache_unittest.cc b/src/lib/datasrc/tests/cache_unittest.cc
index c02622d..9aef8a5 100644
--- a/src/lib/datasrc/tests/cache_unittest.cc
+++ b/src/lib/datasrc/tests/cache_unittest.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define ISC_LIBDATASRC_EXPORT
+
 #include <config.h>
 
 #include <stdexcept>
diff --git a/src/lib/datasrc/tests/client_list_unittest.cc b/src/lib/datasrc/tests/client_list_unittest.cc
index e44c378..7c3fd32 100644
--- a/src/lib/datasrc/tests/client_list_unittest.cc
+++ b/src/lib/datasrc/tests/client_list_unittest.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define ISC_LIBDATASRC_EXPORT
+
 #include <datasrc/client_list.h>
 #include <datasrc/client.h>
 #include <datasrc/data_source.h>
diff --git a/src/lib/datasrc/tests/client_unittest.cc b/src/lib/datasrc/tests/client_unittest.cc
index 87ab5e0..931de9b 100644
--- a/src/lib/datasrc/tests/client_unittest.cc
+++ b/src/lib/datasrc/tests/client_unittest.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define ISC_LIBDATASRC_EXPORT
+
 #include <utility>
 
 #include <datasrc/client.h>
diff --git a/src/lib/datasrc/tests/database_unittest.cc b/src/lib/datasrc/tests/database_unittest.cc
index 8230888..5ff3490 100644
--- a/src/lib/datasrc/tests/database_unittest.cc
+++ b/src/lib/datasrc/tests/database_unittest.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define ISC_LIBDATASRC_EXPORT
+
 #include "faked_nsec3.h"
 
 #include <exceptions/exceptions.h>
diff --git a/src/lib/datasrc/tests/datasrc_unittest.cc b/src/lib/datasrc/tests/datasrc_unittest.cc
index 36bed1d..a918b29 100644
--- a/src/lib/datasrc/tests/datasrc_unittest.cc
+++ b/src/lib/datasrc/tests/datasrc_unittest.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define ISC_LIBDATASRC_EXPORT
+
 #include <stdint.h>
 
 #include <iostream>
diff --git a/src/lib/datasrc/tests/factory_unittest.cc b/src/lib/datasrc/tests/factory_unittest.cc
index 1b71615..38608ef 100644
--- a/src/lib/datasrc/tests/factory_unittest.cc
+++ b/src/lib/datasrc/tests/factory_unittest.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define ISC_LIBDATASRC_EXPORT
+
 #include <config.h>
 
 #include <boost/scoped_ptr.hpp>
@@ -50,11 +52,15 @@ pathtestHelper(const std::string& file, const std::string& expected_error) {
     EXPECT_EQ(expected_error, error.substr(0, expected_error.size()));
 }
 
-#ifndef _WIN32
+#if !defined(_WIN32) || !defined(USE_STATIC_LINK)
 TEST(FactoryTest, paths) {
     // Test whether the paths are made absolute if they are not,
     // by inspecting the error that is raised when they are wrong
+#ifndef _WIN32
     const std::string error("dlopen failed for ");
+#else
+    const std::string error("LoadLibrary failed for ");
+#endif
     // With the current implementation, we can safely assume this has
     // been set for this test (as the loader would otherwise also fail
     // unless the loadable backend library happens to be installed)
@@ -64,34 +70,87 @@ TEST(FactoryTest, paths) {
     pathtestHelper("/no_such_file.so", error + "/no_such_file.so");
 
     // If no ending in .so, it should get _ds.so
+#if !defined(_WIN32) || !defined(_DEBUG)
     pathtestHelper("/no_such_file", error + "/no_such_file_ds.so");
+#else
+    pathtestHelper("/no_such_file", error + "/no_such_file_dsD.so");
+#endif
 
     // If not starting with /, path should be added. For this test that
     // means the build directory as set in B10_FROM_BUILD
+#if !defined(_WIN32)
     pathtestHelper("no_such_file.so", error + builddir +
                    "/src/lib/datasrc/.libs/no_such_file.so");
     pathtestHelper("no_such_file", error + builddir +
                    "/src/lib/datasrc/.libs/no_such_file_ds.so");
+#else
+#ifndef _DEBUG
+    pathtestHelper("no_such_file.so", error + builddir +
+                   "/win32build/VS2010/Release/no_such_file.so");
+    pathtestHelper("no_such_file", error + builddir +
+                   "/win32build/VS2010/Release/no_such_file_ds.so");
+#else
+    pathtestHelper("no_such_file.so", error + builddir +
+                   "/win32build/VS2010/Debug/no_such_file.so");
+    pathtestHelper("no_such_file", error + builddir +
+                   "/win32build/VS2010/Debug/no_such_file_dsD.so");
+#endif
+#endif
 
     // Some tests with '.so' in the name itself
+#ifndef _WIN32
     pathtestHelper("no_such_file.so.something", error + builddir +
                    "/src/lib/datasrc/.libs/no_such_file.so.something_ds.so");
+#else
+#ifndef _DEBUG
+    pathtestHelper("no_such_file.so.something", error + builddir +
+                   "/win32build/VS2010/Release/no_such_file.so.something_ds.so");
+#else
+    pathtestHelper("no_such_file.so.something", error + builddir +
+                   "/win32build/VS2010/Debug/no_such_file.so.something_dsD.so");
+#endif
+#endif
+#if !defined(_WIN32) || !defined(_DEBUG)
     pathtestHelper("/no_such_file.so.something", error +
                    "/no_such_file.so.something_ds.so");
+#else
+    pathtestHelper("/no_such_file.so.something", error +
+                   "/no_such_file.so.something_dsD.so");
+#endif
     pathtestHelper("/no_such_file.so.something.so", error +
                    "/no_such_file.so.something.so");
     pathtestHelper("/no_such_file.so.so", error +
                    "/no_such_file.so.so");
+#ifndef _WIN32
     pathtestHelper("no_such_file.so.something", error + builddir +
                    "/src/lib/datasrc/.libs/no_such_file.so.something_ds.so");
+#else
+#ifndef _DEBUG
+    pathtestHelper("no_such_file.so.something", error + builddir +
+                   "/win32build/VS2010/Release/no_such_file.so.something_ds.so");
+#else
+    pathtestHelper("no_such_file.so.something", error + builddir +
+                   "/win32build/VS2010/Debug/no_such_file.so.something_dsD.so");
+#endif
+#endif
 
     // Temporarily unset B10_FROM_BUILD to see that BACKEND_LIBRARY_PATH
     // is used
+#ifndef _WIN32
     unsetenv("B10_FROM_BUILD");
+#else
+    std::string uv = "B10_FROM_BUILD=";
+    _putenv(uv.c_str());
+#endif
     pathtestHelper("no_such_file.so", error + BACKEND_LIBRARY_PATH +
                    "no_such_file.so");
     // Put it back just in case
+#ifndef _WIN32
     setenv("B10_FROM_BUILD", builddir.c_str(), 1);
+#else
+    std::string vv = "B10_FROM_BUILD=" + builddir;
+    _putenv(vv.c_str());
+#endif
 
     // Test some bad input values
     ASSERT_THROW(DataSourceClientContainer("", ElementPtr()),
diff --git a/src/lib/datasrc/tests/faked_nsec3.cc b/src/lib/datasrc/tests/faked_nsec3.cc
index 1e37b8e..3498ddf 100644
--- a/src/lib/datasrc/tests/faked_nsec3.cc
+++ b/src/lib/datasrc/tests/faked_nsec3.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define ISC_LIBDATASRC_EXPORT
+
 #include "faked_nsec3.h"
 
 #include <dns/name.h>
diff --git a/src/lib/datasrc/tests/logger_unittest.cc b/src/lib/datasrc/tests/logger_unittest.cc
index df5a41c..668cd75 100644
--- a/src/lib/datasrc/tests/logger_unittest.cc
+++ b/src/lib/datasrc/tests/logger_unittest.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define ISC_LIBDATASRC_EXPORT
+
 #include <gtest/gtest.h>
 
 #include <datasrc/logger.h>
diff --git a/src/lib/datasrc/tests/memory_datasrc_unittest.cc b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
index a9faf28..1a26c08 100644
--- a/src/lib/datasrc/tests/memory_datasrc_unittest.cc
+++ b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define ISC_LIBDATASRC_EXPORT
+
 #include "faked_nsec3.h"
 
 #include <exceptions/exceptions.h>
diff --git a/src/lib/datasrc/tests/query_unittest.cc b/src/lib/datasrc/tests/query_unittest.cc
index 7a20b86..e48b84f 100644
--- a/src/lib/datasrc/tests/query_unittest.cc
+++ b/src/lib/datasrc/tests/query_unittest.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define ISC_LIBDATASRC_EXPORT
+
 #include <gtest/gtest.h>
 
 #include <util/buffer.h>
diff --git a/src/lib/datasrc/tests/rbnode_rrset_unittest.cc b/src/lib/datasrc/tests/rbnode_rrset_unittest.cc
index 57e8dbd..db4c026 100644
--- a/src/lib/datasrc/tests/rbnode_rrset_unittest.cc
+++ b/src/lib/datasrc/tests/rbnode_rrset_unittest.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define ISC_LIBDATASRC_EXPORT
+
 #include <exceptions/exceptions.h>
 #include <dns/rdataclass.h>
 #include <datasrc/rbnode_rrset.h>
diff --git a/src/lib/datasrc/tests/rbtree_unittest.cc b/src/lib/datasrc/tests/rbtree_unittest.cc
index bd12e6a..b92efcd 100644
--- a/src/lib/datasrc/tests/rbtree_unittest.cc
+++ b/src/lib/datasrc/tests/rbtree_unittest.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define ISC_LIBDATASRC_EXPORT
+
 #include <gtest/gtest.h>
 
 #include <exceptions/exceptions.h>
diff --git a/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc b/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
index 27389f2..a83e27e 100644
--- a/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
+++ b/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define ISC_LIBDATASRC_EXPORT
+
 #include "faked_nsec3.h"
 
 #include <datasrc/sqlite3_accessor.h>
diff --git a/src/lib/datasrc/tests/sqlite3_unittest.cc b/src/lib/datasrc/tests/sqlite3_unittest.cc
index ac1211b..63e3da7 100644
--- a/src/lib/datasrc/tests/sqlite3_unittest.cc
+++ b/src/lib/datasrc/tests/sqlite3_unittest.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define ISC_LIBDATASRC_EXPORT
+
 #include <stdint.h>
 
 #include <algorithm>
diff --git a/src/lib/datasrc/tests/static_unittest.cc b/src/lib/datasrc/tests/static_unittest.cc
index 2a19ecb..c9984c5 100644
--- a/src/lib/datasrc/tests/static_unittest.cc
+++ b/src/lib/datasrc/tests/static_unittest.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define ISC_LIBDATASRC_EXPORT
+
 #include <stdint.h>
 #include <string>
 #include <vector>
diff --git a/src/lib/datasrc/tests/test_client.cc b/src/lib/datasrc/tests/test_client.cc
index e71a42b..6c9491d 100644
--- a/src/lib/datasrc/tests/test_client.cc
+++ b/src/lib/datasrc/tests/test_client.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define ISC_LIBDATASRC_EXPORT
+
 #include <exceptions/exceptions.h>
 
 #include <dns/masterload.h>
diff --git a/src/lib/datasrc/tests/test_datasrc.cc b/src/lib/datasrc/tests/test_datasrc.cc
index ee318ec..e5ad555 100644
--- a/src/lib/datasrc/tests/test_datasrc.cc
+++ b/src/lib/datasrc/tests/test_datasrc.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define ISC_LIBDATASRC_EXPORT
+
 #include <config.h>
 
 #include <cassert>
diff --git a/src/lib/datasrc/tests/zone_finder_context_unittest.cc b/src/lib/datasrc/tests/zone_finder_context_unittest.cc
index 780feef..000bf3c 100644
--- a/src/lib/datasrc/tests/zone_finder_context_unittest.cc
+++ b/src/lib/datasrc/tests/zone_finder_context_unittest.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define ISC_LIBDATASRC_EXPORT
+
 #include <exceptions/exceptions.h>
 
 #include <dns/masterload.h>
diff --git a/src/lib/datasrc/tests/zonetable_unittest.cc b/src/lib/datasrc/tests/zonetable_unittest.cc
index 5c7837e..f16d1b0 100644
--- a/src/lib/datasrc/tests/zonetable_unittest.cc
+++ b/src/lib/datasrc/tests/zonetable_unittest.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define ISC_LIBDATASRC_EXPORT
+
 #include <exceptions/exceptions.h>
 
 #include <dns/name.h>
diff --git a/src/lib/dhcp/tests/iface_mgr_unittest.cc b/src/lib/dhcp/tests/iface_mgr_unittest.cc
index 5afa943..3449af5 100644
--- a/src/lib/dhcp/tests/iface_mgr_unittest.cc
+++ b/src/lib/dhcp/tests/iface_mgr_unittest.cc
@@ -235,20 +235,22 @@ TEST_F(IfaceMgrTest, sockets6) {
     // bind multicast socket to port 10547
 #ifdef _WIN32
     SOCKET socket1 = ifacemgr->openSocket(LOOPBACK, loAddr, 10547);
+    EXPECT_NE(socket1, INVALID_SOCKET); // socket > 0
 #else
     int socket1 = ifacemgr->openSocket(LOOPBACK, loAddr, 10547);
+    EXPECT_GT(socket1, 0); // socket > 0
 #endif
-    EXPECT_NE(socket1, INVALID_SOCKET); // socket > 0
 
     EXPECT_EQ(socket1, ifacemgr->getSocket(pkt6));
 
     // bind unicast socket to port 10548
 #ifdef _WIN32
     SOCKET socket2 = ifacemgr->openSocket(LOOPBACK, loAddr, 10548);
+    EXPECT_NE(socket2, INVALID_SOCKET);
 #else
     int socket2 = ifacemgr->openSocket(LOOPBACK, loAddr, 10548);
+    EXPECT_GT(socket2, 0);
 #endif
-    EXPECT_NE(socket2, INVALID_SOCKET);
 
     // removed code for binding socket twice to the same address/port
     // as it caused problems on some platforms (e.g. Mac OS X)
@@ -278,19 +280,21 @@ TEST_F(IfaceMgrTest, DISABLED_sockets6Mcast) {
     // bind multicast socket to port 10547
 #ifdef _WIN32
     SOCKET socket1 = ifacemgr->openSocket(LOOPBACK, mcastAddr, 10547);
+    EXPECT_NE(socket1, INVALID_SOCKET); // socket > 0
 #else
     int socket1 = ifacemgr->openSocket(LOOPBACK, mcastAddr, 10547);
+    EXPECT_GT(socket1, 0); // socket > 0
 #endif
-    EXPECT_NE(socket1, INVALID_SOCKET); // socket > 0
 
     // expect success. This address/port is already bound, but
     // we are using SO_REUSEADDR, so we can bind it twice
 #ifdef _WIN32
     SOCKET socket2 = ifacemgr->openSocket(LOOPBACK, mcastAddr, 10547);
+    EXPECT_NE(socket2, INVALID_SOCKET);
 #else
     int socket2 = ifacemgr->openSocket(LOOPBACK, mcastAddr, 10547);
+    EXPECT_GT(socket2, 0);
 #endif
-    EXPECT_NE(socket2, INVALID_SOCKET);
 
     // there's no good way to test negative case here.
     // we would need non-multicast interface. We will be able
@@ -320,15 +324,20 @@ TEST_F(IfaceMgrTest, sendReceive6) {
 #ifdef _WIN32
     SOCKET socket1 = INVALID_SOCKET, socket2 = INVALID_SOCKET;
 #else
-    int socket1 = INVALID_SOCKET, socket2 = INVALID_SOCKET;
+    int socket1 = 0, socket2 = 0;
 #endif
     EXPECT_NO_THROW(
         socket1 = ifacemgr->openSocket(LOOPBACK, loAddr, 10547);
         socket2 = ifacemgr->openSocket(LOOPBACK, loAddr, 10546);
     );
 
+#ifdef _WIN32
     EXPECT_NE(socket1, INVALID_SOCKET);
     EXPECT_NE(socket2, INVALID_SOCKET);
+#else
+    EXPECT_GT(socket1, 0);
+    EXPECT_GT(socket2, 0);
+#endif
 
 
     // prepare dummy payload
@@ -381,15 +390,20 @@ TEST_F(IfaceMgrTest, sendReceive4) {
 #ifdef _WIN32
     SOCKET socket1 = INVALID_SOCKET, socket2 = INVALID_SOCKET;
 #else
-    int socket1 = INVALID_SOCKET, socket2 = INVALID_SOCKET;
+    int socket1 = 0, socket2 = 0;
 #endif
     EXPECT_NO_THROW(
         socket1 = ifacemgr->openSocket(LOOPBACK, loAddr, DHCP4_SERVER_PORT + 10000);
         socket2 = ifacemgr->openSocket(LOOPBACK, loAddr, DHCP4_SERVER_PORT + 10000 + 1);
     );
 
+#ifdef _WIN32
     EXPECT_NE(socket1, INVALID_SOCKET);
     EXPECT_NE(socket2, INVALID_SOCKET);
+#else
+    EXPECT_GE(socket1, 0);
+    EXPECT_GE(socket2, 0);
+#endif
 
     boost::shared_ptr<Pkt4> sendPkt(new Pkt4(DHCPDISCOVER, 1234) );
 
@@ -475,14 +489,18 @@ TEST_F(IfaceMgrTest, socket4) {
 #ifdef _WIN32
     SOCKET socket1 = INVALID_SOCKET;
 #else
-    int socket1 = INVALID_SOCKET;
+    int socket1 = 0;
 #endif
 
     EXPECT_NO_THROW(
         socket1 = ifacemgr->openSocket(LOOPBACK, loAddr, DHCP4_SERVER_PORT + 10000);
     );
 
+#ifdef _WIN32
     EXPECT_NE(socket1, INVALID_SOCKET);
+#else
+    EXPECT_GT(socket1, 0);
+#endif
 
     Pkt4 pkt(DHCPDISCOVER, 1234);
     pkt.setIface(LOOPBACK);
diff --git a/src/lib/python/isc/util/cio/socketsessionforwarder_python.cc b/src/lib/python/isc/util/cio/socketsessionforwarder_python.cc
index f6e406f..b026d2e 100644
--- a/src/lib/python/isc/util/cio/socketsessionforwarder_python.cc
+++ b/src/lib/python/isc/util/cio/socketsessionforwarder_python.cc
@@ -184,9 +184,9 @@ SocketSessionForwarder_push(PyObject* po_self, PyObject* args) {
 
     try {
 #ifdef _WIN32
-        SOCKET fd,
+        SOCKET fd;
 #else
-        int fd,
+        int fd;
 #endif
         int family, type, protocol;
         PyObject* po_local_end;
diff --git a/src/lib/server_common/socket_request.h b/src/lib/server_common/socket_request.h
index 98743d4..ded0914 100644
--- a/src/lib/server_common/socket_request.h
+++ b/src/lib/server_common/socket_request.h
@@ -68,9 +68,9 @@ public:
     /// or fill it into an asio socket). The other part is the token
     /// representing the socket, which allows it to be given up again.
 #ifdef _WIN32
-    typedef std::pair<int, std::string> SocketID;
-#else
     typedef std::pair<SOCKET, std::string> SocketID;
+#else
+    typedef std::pair<int, std::string> SocketID;
 #endif
 
     /// \brief The protocol of requested socket
diff --git a/src/lib/util/io/fd.cc b/src/lib/util/io/fd.cc
index f911956..8218605 100644
--- a/src/lib/util/io/fd.cc
+++ b/src/lib/util/io/fd.cc
@@ -21,6 +21,8 @@
 #define write _write
 #define read _read
 #else
+#include <sys/types.h>
+#include <sys/socket.h>
 #include <unistd.h>
 #endif
 #include <cerrno>
diff --git a/src/lib/util/io/fdshare_python.cc b/src/lib/util/io/fdshare_python.cc
index 553a8b0..f680867 100644
--- a/src/lib/util/io/fdshare_python.cc
+++ b/src/lib/util/io/fdshare_python.cc
@@ -31,7 +31,11 @@ fdshare_recv_fd(PyObject*, PyObject* args) {
     if (!PyArg_ParseTuple(args, "i", &sock)) {
         return (NULL);
     }
+#ifdef _WIN32
     fd = (int) isc::util::io::recv_fd((SOCKET) sock);
+#else
+    fd = isc::util::io::recv_fd(sock);
+#endif
     return (Py_BuildValue("i", fd));
 }
 
@@ -41,7 +45,11 @@ fdshare_send_fd(PyObject*, PyObject* args) {
     if (!PyArg_ParseTuple(args, "ii", &sock, &fd)) {
         return (NULL);
     }
+#ifdef _WIN32
     result = isc::util::io::send_fd((SOCKET) sock, (SOCKET) fd);
+#else
+    result = isc::util::io::send_fd(sock, fd);
+#endif
     return (Py_BuildValue("i", result));
 }
 
diff --git a/src/lib/util/io/sockaddr_util.h b/src/lib/util/io/sockaddr_util.h
index a487d5b..03ead74 100644
--- a/src/lib/util/io/sockaddr_util.h
+++ b/src/lib/util/io/sockaddr_util.h
@@ -64,6 +64,36 @@ convertSockAddr(SSAType* sa) {
     return (static_cast<DSAType*>(p));
 }
 
+#ifndef _WIN32
+template <typename SAType>
+const struct sockaddr*
+convertSockAddr(const SAType* sa) {
+    const void* p = sa;
+    return (static_cast<const struct sockaddr*>(p));
+}
+
+template <typename SAType>
+const SAType*
+convertSockAddr(const struct sockaddr* sa) {
+    const void* p = sa;
+    return (static_cast<const SAType*>(p));
+}
+
+template <typename SAType>
+struct sockaddr*
+convertSockAddr(SAType* sa) {
+    void* p = sa;
+    return (static_cast<struct sockaddr*>(p));
+}
+
+template <typename SAType>
+SAType*
+convertSockAddr(struct sockaddr* sa) {
+    void* p = sa;
+    return (static_cast<SAType*>(p));
+}
+#endif
+
 }
 }
 }
diff --git a/tests/tools/badpacket/command_options.cc b/tests/tools/badpacket/command_options.cc
index 25eded6..64a99bd 100644
--- a/tests/tools/badpacket/command_options.cc
+++ b/tests/tools/badpacket/command_options.cc
@@ -18,7 +18,11 @@
 #include <vector>
 
 #include <boost/lexical_cast.hpp>
+#ifdef _WIN32
 #include <getopt_long.h>
+#else
+#include <getopt.h>
+#endif
 
 #include "exceptions/exceptions.h"
 #include "util/strutil.h"
diff --git a/win32build/VS2010/bind10.sln b/win32build/VS2010/bind10.sln
index a4e7ab9..cbb05ad 100755
--- a/win32build/VS2010/bind10.sln
+++ b/win32build/VS2010/bind10.sln
@@ -687,6 +687,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdatasrc_static", "libdat
 		{AEF3DFFE-B566-4E6A-B299-B59B81022C06} = {AEF3DFFE-B566-4E6A-B299-B59B81022C06}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdatasrc_ftests", "libdatasrc_ftests\libdatasrc_ftests.vcxproj", "{308ECD43-49D4-4663-B9C9-9AC18893E007}"
+	ProjectSection(ProjectDependencies) = postProject
+		{32624520-5341-471B-B88D-2599DBCDABF5} = {32624520-5341-471B-B88D-2599DBCDABF5}
+		{7D04222B-643C-446C-A2B8-93AF74A86246} = {7D04222B-643C-446C-A2B8-93AF74A86246}
+		{D28AD35D-E759-442E-8AC9-582DB8AA7D97} = {D28AD35D-E759-442E-8AC9-582DB8AA7D97}
+		{55BCB364-62B0-4F93-8B88-38F3349B22C8} = {55BCB364-62B0-4F93-8B88-38F3349B22C8}
+		{8F120666-1A69-4506-8546-0F665E80FFB7} = {8F120666-1A69-4506-8546-0F665E80FFB7}
+		{58BDBBCB-A5C5-4C3B-BC3C-EB8AD72D8DAC} = {58BDBBCB-A5C5-4C3B-BC3C-EB8AD72D8DAC}
+		{F6E728D3-A0B2-40F6-9B91-7D4474D778F3} = {F6E728D3-A0B2-40F6-9B91-7D4474D778F3}
+		{FD0368DA-87CE-44D8-802B-9E755E95B493} = {FD0368DA-87CE-44D8-802B-9E755E95B493}
+		{CC29C1F9-A77B-476C-803E-8830F8312571} = {CC29C1F9-A77B-476C-803E-8830F8312571}
+		{2844FDFB-A0A1-4FA4-A654-15D69CC717DD} = {2844FDFB-A0A1-4FA4-A654-15D69CC717DD}
+		{AEF3DFFE-B566-4E6A-B299-B59B81022C06} = {AEF3DFFE-B566-4E6A-B299-B59B81022C06}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -973,6 +988,10 @@ Global
 		{FD0368DA-87CE-44D8-802B-9E755E95B493}.Debug|Win32.Build.0 = Debug|Win32
 		{FD0368DA-87CE-44D8-802B-9E755E95B493}.Release|Win32.ActiveCfg = Release|Win32
 		{FD0368DA-87CE-44D8-802B-9E755E95B493}.Release|Win32.Build.0 = Release|Win32
+		{308ECD43-49D4-4663-B9C9-9AC18893E007}.Debug|Win32.ActiveCfg = Debug|Win32
+		{308ECD43-49D4-4663-B9C9-9AC18893E007}.Debug|Win32.Build.0 = Debug|Win32
+		{308ECD43-49D4-4663-B9C9-9AC18893E007}.Release|Win32.ActiveCfg = Release|Win32
+		{308ECD43-49D4-4663-B9C9-9AC18893E007}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/win32build/VS2010/libacl/libacl.vcxproj b/win32build/VS2010/libacl/libacl.vcxproj
index 4feaeda..e19d6e9 100755
--- a/win32build/VS2010/libacl/libacl.vcxproj
+++ b/win32build/VS2010/libacl/libacl.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -51,12 +51,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libasiodns/libasiodns.vcxproj b/win32build/VS2010/libasiodns/libasiodns.vcxproj
index d0bd4e5..f7e55cc 100755
--- a/win32build/VS2010/libasiodns/libasiodns.vcxproj
+++ b/win32build/VS2010/libasiodns/libasiodns.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -62,12 +62,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libasiolink/libasiolink.vcxproj b/win32build/VS2010/libasiolink/libasiolink.vcxproj
index c02f709..4de4e1d 100755
--- a/win32build/VS2010/libasiolink/libasiolink.vcxproj
+++ b/win32build/VS2010/libasiolink/libasiolink.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -68,12 +68,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libbench/libbench.vcxproj b/win32build/VS2010/libbench/libbench.vcxproj
index 230ba73..e2db377 100755
--- a/win32build/VS2010/libbench/libbench.vcxproj
+++ b/win32build/VS2010/libbench/libbench.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -47,12 +47,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libcache/libcache.vcxproj b/win32build/VS2010/libcache/libcache.vcxproj
index 27c09bc..7b28a1c 100755
--- a/win32build/VS2010/libcache/libcache.vcxproj
+++ b/win32build/VS2010/libcache/libcache.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -66,12 +66,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libcc/libcc.vcxproj b/win32build/VS2010/libcc/libcc.vcxproj
index 9381632..792a1b9 100755
--- a/win32build/VS2010/libcc/libcc.vcxproj
+++ b/win32build/VS2010/libcc/libcc.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -53,12 +53,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libcfgclient/libcfgclient.vcxproj b/win32build/VS2010/libcfgclient/libcfgclient.vcxproj
index 50b2ceb..07e1a42 100755
--- a/win32build/VS2010/libcfgclient/libcfgclient.vcxproj
+++ b/win32build/VS2010/libcfgclient/libcfgclient.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -56,12 +56,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libcryptolink/libcryptolink.vcxproj b/win32build/VS2010/libcryptolink/libcryptolink.vcxproj
index 9ef5afc..9896841 100755
--- a/win32build/VS2010/libcryptolink/libcryptolink.vcxproj
+++ b/win32build/VS2010/libcryptolink/libcryptolink.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -48,12 +48,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libdatasrc/libdatasrc.vcxproj b/win32build/VS2010/libdatasrc/libdatasrc.vcxproj
index d15940b..70a86c2 100755
--- a/win32build/VS2010/libdatasrc/libdatasrc.vcxproj
+++ b/win32build/VS2010/libdatasrc/libdatasrc.vcxproj
@@ -26,6 +26,8 @@
     <ClInclude Include="..\..\..\src\lib\datasrc\rbnode_rrset.h" />
     <ClInclude Include="..\..\..\src\lib\datasrc\rbtree.h" />
     <ClInclude Include="..\..\..\src\lib\datasrc\result.h" />
+    <ClInclude Include="..\..\..\src\lib\datasrc\sqlite3_datasrc.h" />
+    <ClInclude Include="..\..\..\src\lib\datasrc\static_datasrc.h" />
     <ClInclude Include="..\..\..\src\lib\datasrc\zone.h" />
     <ClInclude Include="..\..\..\src\lib\datasrc\zonetable.h" />
   </ItemGroup>
@@ -38,6 +40,8 @@
     <ClCompile Include="..\..\..\src\lib\datasrc\factory.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\logger.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\query.cc" />
+    <ClCompile Include="..\..\..\src\lib\datasrc\sqlite3_datasrc.cc" />
+    <ClCompile Include="..\..\..\src\lib\datasrc\static_datasrc.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\zonetable.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\zone_finder_context.cc" />
     <ClCompile Include="..\..\dllmain.cc" />
@@ -70,26 +74,24 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;PKGLIBDIR="%BIND10HOME%/win32build/VS2010/$(Configuration)/";_DEBUG;_LIB;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <CompileAs>CompileAsCpp</CompileAs>
       <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\dns;%BOOST%;C:\sqlite3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libexceptionsd.lib;libutild.lib;liblogd.lib;libdns++d.lib;libccd.lib;libcached.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\$(Configuration);C:\sqlite3;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libexceptionsd.lib;libutild.lib;liblogd.lib;libdns++d.lib;libccd.lib;libcached.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
     </Link>
     <PreBuildEvent>
       <Command>cd ..\..\..\src\lib\datasrc
@@ -111,7 +113,7 @@ copy static.zone.win32 static.zone
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;PKGLIBDIR="%BIND10HOME%/win32build/VS2010/$(Configuration)/";NDEBUG;_LIB;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <CompileAs>CompileAsCpp</CompileAs>
       <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\dns;%BOOST%;C:\sqlite3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
@@ -120,8 +122,8 @@ copy static.zone.win32 static.zone
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libexceptions.lib;libutil.lib;liblog.lib;libdns++.lib;libcc.lib;libcache.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\$(Configuration);C:\sqlite3;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libexceptions.lib;libutil.lib;liblog.lib;libdns++.lib;libcc.lib;libcache.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
       <Command>cd ..\..\..\src\lib\datasrc
diff --git a/win32build/VS2010/libdatasrc/libdatasrc.vcxproj.filters b/win32build/VS2010/libdatasrc/libdatasrc.vcxproj.filters
index 5d467f6..d05516c 100755
--- a/win32build/VS2010/libdatasrc/libdatasrc.vcxproj.filters
+++ b/win32build/VS2010/libdatasrc/libdatasrc.vcxproj.filters
@@ -45,9 +45,6 @@
     <ClInclude Include="..\..\..\src\lib\datasrc\iterator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\lib\datasrc\datasrc_messages.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\lib\datasrc\factory.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -63,6 +60,15 @@
     <ClInclude Include="..\..\..\src\lib\datasrc\datasrc_config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\lib\datasrc\static_datasrc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\lib\datasrc\sqlite3_datasrc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\lib\datasrc\datasrc_messages.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\src\lib\datasrc\logger.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -83,9 +89,6 @@
     <ClCompile Include="..\..\..\src\lib\datasrc\database.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\datasrc\datasrc_messages.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\lib\datasrc\client_list.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -98,6 +101,15 @@
     <ClCompile Include="..\..\..\src\lib\datasrc\factory.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\lib\datasrc\static_datasrc.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\lib\datasrc\sqlite3_datasrc.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\lib\datasrc\datasrc_messages.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\src\lib\datasrc\logger.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/win32build/VS2010/libdatasrc_memory/libdatasrc_memory.vcxproj b/win32build/VS2010/libdatasrc_memory/libdatasrc_memory.vcxproj
index dbfbccb..7561e5c 100644
--- a/win32build/VS2010/libdatasrc_memory/libdatasrc_memory.vcxproj
+++ b/win32build/VS2010/libdatasrc_memory/libdatasrc_memory.vcxproj
@@ -86,7 +86,7 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\src\lib\datasrc\datasrc_messages.h" />
     <ClInclude Include="..\..\..\src\lib\datasrc\dll.h" />
-    <ClInclude Include="..\..\..\src\lib\datasrc\memory_datasrc.h" />
+    <ClInclude Include="..\..\..\src\lib\datasrc\logger.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\lib\datasrc\datasrc_messages.cc" />
diff --git a/win32build/VS2010/libdatasrc_memory/libdatasrc_memory.vcxproj.filters b/win32build/VS2010/libdatasrc_memory/libdatasrc_memory.vcxproj.filters
index 616c2bb..73cfbe1 100644
--- a/win32build/VS2010/libdatasrc_memory/libdatasrc_memory.vcxproj.filters
+++ b/win32build/VS2010/libdatasrc_memory/libdatasrc_memory.vcxproj.filters
@@ -18,7 +18,7 @@
     <ClInclude Include="..\..\..\src\lib\datasrc\dll.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\lib\datasrc\memory_datasrc.h">
+    <ClInclude Include="..\..\..\src\lib\datasrc\logger.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\lib\datasrc\datasrc_messages.h">
@@ -26,19 +26,19 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\lib\datasrc\datasrc_messages.cc">
+    <ClCompile Include="..\..\..\src\lib\datasrc\memory_datasrc_link.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\datasrc\memory_datasrc.cc">
+    <ClCompile Include="..\..\dllmain.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\datasrc\memory_datasrc_link.cc">
+    <ClCompile Include="..\..\..\src\lib\datasrc\memory_datasrc.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\dllmain.cc">
+    <ClCompile Include="..\..\..\src\lib\datasrc\logger.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\datasrc\logger.cc">
+    <ClCompile Include="..\..\..\src\lib\datasrc\datasrc_messages.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/win32build/VS2010/libdatasrc_sqlite3/libdatasrc_sqlite3.vcxproj b/win32build/VS2010/libdatasrc_sqlite3/libdatasrc_sqlite3.vcxproj
index 22eb0b7..317c1b8 100644
--- a/win32build/VS2010/libdatasrc_sqlite3/libdatasrc_sqlite3.vcxproj
+++ b/win32build/VS2010/libdatasrc_sqlite3/libdatasrc_sqlite3.vcxproj
@@ -86,15 +86,14 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\src\lib\datasrc\datasrc_messages.h" />
     <ClInclude Include="..\..\..\src\lib\datasrc\dll.h" />
+    <ClInclude Include="..\..\..\src\lib\datasrc\logger.h" />
     <ClInclude Include="..\..\..\src\lib\datasrc\sqlite3_accessor.h" />
-    <ClInclude Include="..\..\..\src\lib\datasrc\sqlite3_datasrc.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\lib\datasrc\datasrc_messages.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\logger.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\sqlite3_accessor.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\sqlite3_accessor_link.cc" />
-    <ClCompile Include="..\..\..\src\lib\datasrc\sqlite3_datasrc.cc" />
     <ClCompile Include="..\..\dllmain.cc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/win32build/VS2010/libdatasrc_sqlite3/libdatasrc_sqlite3.vcxproj.filters b/win32build/VS2010/libdatasrc_sqlite3/libdatasrc_sqlite3.vcxproj.filters
index e7cf5f2..276b2c8 100644
--- a/win32build/VS2010/libdatasrc_sqlite3/libdatasrc_sqlite3.vcxproj.filters
+++ b/win32build/VS2010/libdatasrc_sqlite3/libdatasrc_sqlite3.vcxproj.filters
@@ -21,10 +21,10 @@
     <ClInclude Include="..\..\..\src\lib\datasrc\sqlite3_accessor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\lib\datasrc\datasrc_messages.h">
+    <ClInclude Include="..\..\..\src\lib\datasrc\logger.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\lib\datasrc\sqlite3_datasrc.h">
+    <ClInclude Include="..\..\..\src\lib\datasrc\datasrc_messages.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -38,13 +38,10 @@
     <ClCompile Include="..\..\dllmain.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\datasrc\datasrc_messages.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\lib\datasrc\logger.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\datasrc\sqlite3_datasrc.cc">
+    <ClCompile Include="..\..\..\src\lib\datasrc\datasrc_messages.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/win32build/VS2010/libdatasrc_static/libdatasrc_static.vcxproj b/win32build/VS2010/libdatasrc_static/libdatasrc_static.vcxproj
index fdf3106..5e68013 100644
--- a/win32build/VS2010/libdatasrc_static/libdatasrc_static.vcxproj
+++ b/win32build/VS2010/libdatasrc_static/libdatasrc_static.vcxproj
@@ -86,14 +86,13 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\src\lib\datasrc\datasrc_messages.h" />
     <ClInclude Include="..\..\..\src\lib\datasrc\dll.h" />
+    <ClInclude Include="..\..\..\src\lib\datasrc\logger.h" />
     <ClInclude Include="..\..\..\src\lib\datasrc\memory_datasrc.h" />
-    <ClInclude Include="..\..\..\src\lib\datasrc\static_datasrc.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\lib\datasrc\datasrc_messages.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\logger.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\memory_datasrc.cc" />
-    <ClCompile Include="..\..\..\src\lib\datasrc\static_datasrc.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\static_datasrc_link.cc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/win32build/VS2010/libdatasrc_static/libdatasrc_static.vcxproj.filters b/win32build/VS2010/libdatasrc_static/libdatasrc_static.vcxproj.filters
index 7a43c06..cde1e76 100644
--- a/win32build/VS2010/libdatasrc_static/libdatasrc_static.vcxproj.filters
+++ b/win32build/VS2010/libdatasrc_static/libdatasrc_static.vcxproj.filters
@@ -15,33 +15,30 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\src\lib\datasrc\datasrc_messages.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\lib\datasrc\dll.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\lib\datasrc\memory_datasrc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\lib\datasrc\static_datasrc.h">
+    <ClInclude Include="..\..\..\src\lib\datasrc\logger.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\lib\datasrc\datasrc_messages.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\lib\datasrc\datasrc_messages.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\datasrc\logger.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\lib\datasrc\memory_datasrc.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\lib\datasrc\static_datasrc_link.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\datasrc\static_datasrc.cc">
+    <ClCompile Include="..\..\..\src\lib\datasrc\logger.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\lib\datasrc\datasrc_messages.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj b/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj
index d7a378e..aac0821 100755
--- a/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj
+++ b/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj
@@ -52,7 +52,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;GTEST_LINKED_AS_SHARED_LIBRARY=1;TEST_DATA_DIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";TEST_DATA_COMMONDIR="%BIND10HOME%/src/lib/testutils/testdata";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN32;WIN32;GTEST_LINKED_AS_SHARED_LIBRARY=1;TEST_DATA_DIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";TEST_DATA_COMMONDIR="%BIND10HOME%/src/lib/testutils/testdata";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\..\gtest\include;%BOOST%;C:\sqlite3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
@@ -60,7 +60,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libexceptionsd.lib;libutild.lib;libutil_unittestsd.lib;liblogd.lib;libcryptolinkd.lib;libdns++d.lib;libccd.lib;libtestutilsd.lib;libdatasrcd.lib;sqlite3_dsD.lib;memory_dsD.lib;static_dsD.lib;botand.lib;log4cplusD.lib;gtestd.lib;sqlite3.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libexceptionsd.lib;libutild.lib;libutil_unittestsd.lib;liblogd.lib;libcryptolinkd.lib;libdns++d.lib;libccd.lib;libtestutilsd.lib;libdatasrcd.lib;botand.lib;log4cplusD.lib;gtestd.lib;sqlite3.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);C:\sqlite3;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>
@@ -85,7 +85,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libexceptions.lib;libutil.lib;libutil_unittests.lib;liblog.lib;libcryptolink.lib;libdns++.lib;libcc.lib;libtestutils.lib;libdatasrc.lib;sqlite3_ds.lib;memory_ds.lib;static_ds.lib;botan.lib;log4cplus.lib;gtest.lib;sqlite3.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libexceptions.lib;libutil.lib;libutil_unittests.lib;liblog.lib;libcryptolink.lib;libdns++.lib;libcc.lib;libtestutils.lib;libdatasrc.lib;botan.lib;log4cplus.lib;gtest.lib;sqlite3.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);C:\sqlite3;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>
@@ -94,18 +94,25 @@
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\src\lib\datasrc\datasrc_messages.h" />
+    <ClInclude Include="..\..\..\src\lib\datasrc\logger.h" />
+    <ClInclude Include="..\..\..\src\lib\datasrc\memory_datasrc.h" />
+    <ClInclude Include="..\..\..\src\lib\datasrc\sqlite3_accessor.h" />
     <ClInclude Include="..\..\..\src\lib\datasrc\tests\faked_nsec3.h" />
     <ClInclude Include="..\..\..\src\lib\datasrc\tests\test_client.h" />
     <ClInclude Include="..\..\..\src\lib\datasrc\tests\test_datasrc.h" />
     <ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\src\lib\datasrc\datasrc_messages.cc" />
+    <ClCompile Include="..\..\..\src\lib\datasrc\logger.cc" />
+    <ClCompile Include="..\..\..\src\lib\datasrc\memory_datasrc.cc" />
+    <ClCompile Include="..\..\..\src\lib\datasrc\sqlite3_accessor.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\cache_unittest.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\client_list_unittest.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\client_unittest.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\database_unittest.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\datasrc_unittest.cc" />
-    <ClCompile Include="..\..\..\src\lib\datasrc\tests\factory_unittest.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\faked_nsec3.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\logger_unittest.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\memory_datasrc_unittest.cc" />
diff --git a/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj.filters b/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj.filters
index e5345e3..36745b2 100755
--- a/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj.filters
+++ b/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj.filters
@@ -27,6 +27,18 @@
     <ClInclude Include="..\..\..\src\lib\datasrc\tests\test_client.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\lib\datasrc\memory_datasrc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\lib\datasrc\sqlite3_accessor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\lib\datasrc\logger.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\lib\datasrc\datasrc_messages.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\cache_unittest.cc">
@@ -74,9 +86,6 @@
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\sqlite3_accessor_unittest.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\datasrc\tests\factory_unittest.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\client_list_unittest.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -92,5 +101,17 @@
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\test_client.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\lib\datasrc\logger.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\lib\datasrc\datasrc_messages.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\lib\datasrc\sqlite3_accessor.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\lib\datasrc\memory_datasrc.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libdhcp/libdhcp.vcxproj b/win32build/VS2010/libdhcp/libdhcp.vcxproj
index b74a638..912b850 100755
--- a/win32build/VS2010/libdhcp/libdhcp.vcxproj
+++ b/win32build/VS2010/libdhcp/libdhcp.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -68,12 +68,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libdns++/libdns++.vcxproj b/win32build/VS2010/libdns++/libdns++.vcxproj
index d26386a..c346d27 100755
--- a/win32build/VS2010/libdns++/libdns++.vcxproj
+++ b/win32build/VS2010/libdns++/libdns++.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -103,12 +103,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libdnsacl/libdnsacl.vcxproj b/win32build/VS2010/libdnsacl/libdnsacl.vcxproj
index 04e1ff5..714ffe8 100755
--- a/win32build/VS2010/libdnsacl/libdnsacl.vcxproj
+++ b/win32build/VS2010/libdnsacl/libdnsacl.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -47,12 +47,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libexceptions/libexceptions.vcxproj b/win32build/VS2010/libexceptions/libexceptions.vcxproj
index 5870678..eccb212 100755
--- a/win32build/VS2010/libexceptions/libexceptions.vcxproj
+++ b/win32build/VS2010/libexceptions/libexceptions.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -45,12 +45,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libfake_session/libfake_session.vcxproj b/win32build/VS2010/libfake_session/libfake_session.vcxproj
index e02633c..93dd1ce 100755
--- a/win32build/VS2010/libfake_session/libfake_session.vcxproj
+++ b/win32build/VS2010/libfake_session/libfake_session.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -45,12 +45,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/liblog/liblog.vcxproj b/win32build/VS2010/liblog/liblog.vcxproj
index 6837e23..6c14b40 100755
--- a/win32build/VS2010/liblog/liblog.vcxproj
+++ b/win32build/VS2010/liblog/liblog.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -83,12 +83,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libnsas/libnsas.vcxproj b/win32build/VS2010/libnsas/libnsas.vcxproj
index 37283ad..ecb733c 100755
--- a/win32build/VS2010/libnsas/libnsas.vcxproj
+++ b/win32build/VS2010/libnsas/libnsas.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -72,12 +72,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libresolve/libresolve.vcxproj b/win32build/VS2010/libresolve/libresolve.vcxproj
index 535067c..0cf3b09 100755
--- a/win32build/VS2010/libresolve/libresolve.vcxproj
+++ b/win32build/VS2010/libresolve/libresolve.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -57,12 +57,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libserver_common/libserver_common.vcxproj b/win32build/VS2010/libserver_common/libserver_common.vcxproj
index 0fdb0af..b88b2c4 100755
--- a/win32build/VS2010/libserver_common/libserver_common.vcxproj
+++ b/win32build/VS2010/libserver_common/libserver_common.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -54,12 +54,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libstatistics/libstatistics.vcxproj b/win32build/VS2010/libstatistics/libstatistics.vcxproj
index 91b3095..89ec3dd 100755
--- a/win32build/VS2010/libstatistics/libstatistics.vcxproj
+++ b/win32build/VS2010/libstatistics/libstatistics.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -48,12 +48,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libtestutils/libtestutils.vcxproj b/win32build/VS2010/libtestutils/libtestutils.vcxproj
index e823e8b..975fde3 100755
--- a/win32build/VS2010/libtestutils/libtestutils.vcxproj
+++ b/win32build/VS2010/libtestutils/libtestutils.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -54,12 +54,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libutil/libutil.vcxproj b/win32build/VS2010/libutil/libutil.vcxproj
index a9b30f9..ac4862c 100755
--- a/win32build/VS2010/libutil/libutil.vcxproj
+++ b/win32build/VS2010/libutil/libutil.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -75,12 +75,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libutil_io/libutil_io.vcxproj b/win32build/VS2010/libutil_io/libutil_io.vcxproj
index 715651f..5b8a68e 100755
--- a/win32build/VS2010/libutil_io/libutil_io.vcxproj
+++ b/win32build/VS2010/libutil_io/libutil_io.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -52,12 +52,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libutil_unittests/libutil_unittests.vcxproj b/win32build/VS2010/libutil_unittests/libutil_unittests.vcxproj
index 02a9a9f..38905cc 100755
--- a/win32build/VS2010/libutil_unittests/libutil_unittests.vcxproj
+++ b/win32build/VS2010/libutil_unittests/libutil_unittests.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -55,12 +55,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/libxfr/libxfr.vcxproj b/win32build/VS2010/libxfr/libxfr.vcxproj
index ca84fdb..5108e1a 100755
--- a/win32build/VS2010/libxfr/libxfr.vcxproj
+++ b/win32build/VS2010/libxfr/libxfr.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -46,12 +46,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/win32build/VS2010/pydacl/pydacl.vcxproj b/win32build/VS2010/pydacl/pydacl.vcxproj
index d425ea8..8944606 100755
--- a/win32build/VS2010/pydacl/pydacl.vcxproj
+++ b/win32build/VS2010/pydacl/pydacl.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -39,13 +39,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>acl_d</TargetName>
     <TargetExt>.pyd</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>acl</TargetName>
     <TargetExt>.pyd</TargetExt>
   </PropertyGroup>
diff --git a/win32build/VS2010/pyddatasrc/pyddatasrc.vcxproj b/win32build/VS2010/pyddatasrc/pyddatasrc.vcxproj
index 6c192c1..ed5981e 100755
--- a/win32build/VS2010/pyddatasrc/pyddatasrc.vcxproj
+++ b/win32build/VS2010/pyddatasrc/pyddatasrc.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -39,13 +39,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>datasrc_d</TargetName>
     <TargetExt>.pyd</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>datasrc</TargetName>
     <TargetExt>.pyd</TargetExt>
   </PropertyGroup>
diff --git a/win32build/VS2010/pyddns++/pyddns++.vcxproj b/win32build/VS2010/pyddns++/pyddns++.vcxproj
index 7805dbd..a6974a6 100755
--- a/win32build/VS2010/pyddns++/pyddns++.vcxproj
+++ b/win32build/VS2010/pyddns++/pyddns++.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -40,13 +40,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>pydnspp_d</TargetName>
     <TargetExt>.pyd</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>pydnspp</TargetName>
     <TargetExt>.pyd</TargetExt>
   </PropertyGroup>
diff --git a/win32build/VS2010/pyddnsacl/pyddnsacl.vcxproj b/win32build/VS2010/pyddnsacl/pyddnsacl.vcxproj
index 86e22dd..35ee5d9 100755
--- a/win32build/VS2010/pyddnsacl/pyddnsacl.vcxproj
+++ b/win32build/VS2010/pyddnsacl/pyddnsacl.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -39,13 +39,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>_dns_d</TargetName>
     <TargetExt>.pyd</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>_dns</TargetName>
     <TargetExt>.pyd</TargetExt>
   </PropertyGroup>
diff --git a/win32build/VS2010/pydlog/pydlog.vcxproj b/win32build/VS2010/pydlog/pydlog.vcxproj
index 27ebbee..b6a0462 100755
--- a/win32build/VS2010/pydlog/pydlog.vcxproj
+++ b/win32build/VS2010/pydlog/pydlog.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -39,13 +39,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>log_d</TargetName>
     <TargetExt>.pyd</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetName>log</TargetName>
     <TargetExt>.pyd</TargetExt>
   </PropertyGroup>
diff --git a/win32build/VS2010/pydutil_io/pydutil_io.vcxproj b/win32build/VS2010/pydutil_io/pydutil_io.vcxproj
index 562fef2..43fcbc5 100755
--- a/win32build/VS2010/pydutil_io/pydutil_io.vcxproj
+++ b/win32build/VS2010/pydutil_io/pydutil_io.vcxproj
@@ -1,4 +1,4 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -39,13 +39,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetExt>.pyd</TargetExt>
     <TargetName>libutil_io_python_d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
     <TargetExt>.pyd</TargetExt>
     <TargetName>libutil_io_python</TargetName>
   </PropertyGroup>

