BIND 10 trac2117, updated. 868d91a3c6aa44a1fb5f72c0453755c2ba61d712 add check (final) + rely on PATH vs 'd'names + unittest_util DLL

Thu Aug 30 07:06:31 UTC 2012

The branch, trac2117 has been updated
       via  868d91a3c6aa44a1fb5f72c0453755c2ba61d712 (commit)
      from  16eb45470b30061cfc2fe0fa3a9e456d42a9ffc0 (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 868d91a3c6aa44a1fb5f72c0453755c2ba61d712
Author: Francis Dupont <fdupont at isc.org>
Date:   Thu Aug 30 09:06:03 2012 +0200

    add check (final) + rely on PATH vs 'd'names + unittest_util DLL

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

Summary of changes:
 WIN32-NOTES                                        |   19 +-
 src/lib/{acl => dns/tests}/dll.h                   |   14 +-
 src/lib/dns/tests/unittest_util.cc                 |    2 +
 src/lib/dns/tests/unittest_util.h                  |    3 +-
 src/lib/python/isc/datasrc/__init__.py             |   15 +-
 src/lib/python/isc/log/tests/check_output-win32.sh |    3 +
 src/lib/python/isc/util/socketpair.py              |    4 +-
 src/lib/python/isc/util/socketserver_mixin.py      |    2 +-
 win32build/VS2010/_dns/_dns.vcxproj                |    4 +-
 win32build/VS2010/acl-tests/acl-tests.vcxproj      |    2 +-
 win32build/VS2010/acl/acl.vcxproj                  |    4 +-
 .../VS2010/asiodns-tests/asiodns-tests.vcxproj     |    8 +-
 .../asiodns-tests/asiodns-tests.vcxproj.filters    |    8 -
 .../VS2010/asiolink-tests/asiolink-tests.vcxproj   |    2 +-
 win32build/VS2010/b10-dhcp6/b10-dhcp6.vcxproj      |    2 +-
 win32build/VS2010/b10-host/b10-host.vcxproj        |    2 +-
 .../VS2010/b10-resolver/b10-resolver.vcxproj       |    8 +-
 .../VS2010/badpacket-tests/badpacket-tests.vcxproj |    2 +-
 win32build/VS2010/badpacket/badpacket.vcxproj      |    2 +-
 .../VS2010/bench-example/bench-example.vcxproj     |    2 +-
 win32build/VS2010/bench-tests/bench-tests.vcxproj  |    2 +-
 win32build/VS2010/bind10.sln                       |   19 ++
 win32build/VS2010/cache-tests/cache-tests.vcxproj  |    6 +-
 .../VS2010/cache-tests/cache-tests.vcxproj.filters |    6 -
 win32build/VS2010/cc-tests/cc-tests.vcxproj        |    2 +-
 .../VS2010/config-tests/config-tests.vcxproj       |    2 +-
 .../cryptolink-tests/cryptolink-tests.vcxproj      |    2 +-
 .../VS2010/datasrc-ftests/datasrc-ftests.vcxproj   |    8 +-
 .../datasrc-ftests/datasrc-ftests.vcxproj.filters  |    8 -
 .../VS2010/datasrc-tests/datasrc-tests.vcxproj     |    6 +-
 .../datasrc-tests/datasrc-tests.vcxproj.filters    |    6 -
 win32build/VS2010/datasrc/datasrc.vcxproj          |   28 ++-
 .../VS2010/dhcp++-tests/dhcp++-tests.vcxproj       |    2 +-
 win32build/VS2010/dhcp6-tests/dhcp6-tests.vcxproj  |    2 +-
 .../VS2010/dns++-mbench/dns++-mbench.vcxproj       |    2 +-
 .../VS2010/dns++-rbench/dns++-rbench.vcxproj       |    2 +-
 win32build/VS2010/dns++-tests/dns++-tests.vcxproj  |    6 +-
 .../VS2010/dns++-tests/dns++-tests.vcxproj.filters |    6 -
 .../exceptions-tests/exceptions-tests.vcxproj      |    2 +-
 win32build/VS2010/libb10-acl/libb10-acl.vcxproj    |    6 +-
 .../VS2010/libb10-asiodns/libb10-asiodns.vcxproj   |   12 +-
 .../VS2010/libb10-asiolink/libb10-asiolink.vcxproj |    6 +-
 .../VS2010/libb10-bench/libb10-bench.vcxproj       |    6 +-
 .../VS2010/libb10-cache/libb10-cache.vcxproj       |   14 +-
 win32build/VS2010/libb10-cc/libb10-cc.vcxproj      |   12 +-
 .../libb10-cfgclient/libb10-cfgclient.vcxproj      |   12 +-
 .../libb10-cryptolink/libb10-cryptolink.vcxproj    |    6 +-
 .../VS2010/libb10-datasrc/libb10-datasrc.vcxproj   |   10 +-
 .../VS2010/libb10-dhcp++/libb10-dhcp++.vcxproj     |    6 +-
 .../VS2010/libb10-dns++/libb10-dns++.vcxproj       |    6 +-
 .../VS2010/libb10-dnsacl/libb10-dnsacl.vcxproj     |    6 +-
 .../libb10-exceptions/libb10-exceptions.vcxproj    |    4 +-
 win32build/VS2010/libb10-log/libb10-log.vcxproj    |    6 +-
 win32build/VS2010/libb10-nsas/libb10-nsas.vcxproj  |   12 +-
 .../VS2010/libb10-pydnspp/libb10-pydnspp.vcxproj   |    4 +-
 .../VS2010/libb10-resolve/libb10-resolve.vcxproj   |   12 +-
 .../libb10-server-common.vcxproj                   |   12 +-
 .../libb10-statistics/libb10-statistics.vcxproj    |    6 +-
 .../libb10-testutils/libb10-testutils.vcxproj      |   12 +-
 .../libb10-testutils.vcxproj.filters               |    6 -
 .../VS2010/libb10-util-io/libb10-util-io.vcxproj   |    6 +-
 win32build/VS2010/libb10-util/libb10-util.vcxproj  |    8 +-
 win32build/VS2010/libb10-xfr/libb10-xfr.vcxproj    |    6 +-
 .../VS2010/libfake_session/libfake_session.vcxproj |    6 +-
 .../VS2010/liblog_compiler/liblog_compiler.vcxproj |    2 +-
 .../libunittest_util.vcxproj}                      |   45 ++---
 .../libunittest_util.vcxproj.filters}              |    8 +-
 .../libunittest_util.vcxproj.user}                 |    0
 .../libutil_io_python/libutil_io_python.vcxproj    |    4 +-
 .../libutil_unittests/libutil_unittests.vcxproj    |    6 +-
 win32build/VS2010/log-example/log-example.vcxproj  |    2 +-
 .../VS2010/log-i1utests/log-i1utests.vcxproj       |    2 +-
 .../VS2010/log-i2utests/log-i2utests.vcxproj       |    2 +-
 win32build/VS2010/log-iltest/log-iltest.vcxproj    |    2 +-
 win32build/VS2010/log-lltest/log-lltest.vcxproj    |    2 +-
 win32build/VS2010/log-tests/log-tests.vcxproj      |    9 +-
 win32build/VS2010/log/log.vcxproj                  |   14 +-
 win32build/VS2010/memory_ds/memory_ds.vcxproj      |    4 +-
 win32build/VS2010/nsas-tests/nsas-tests.vcxproj    |    2 +-
 win32build/VS2010/pyddnspp/pyddnspp.vcxproj        |    4 +-
 .../pyunittests_util/pyunittests_util.vcxproj      |    2 +-
 .../VS2010/resolve-tests/resolve-tests.vcxproj     |    6 +-
 .../resolve-tests/resolve-tests.vcxproj.filters    |    6 -
 .../VS2010/resolver-tests/resolver-tests.vcxproj   |   10 +-
 .../resolver-tests/resolver-tests.vcxproj.filters  |    6 -
 .../server-common-tests.vcxproj                    |    2 +-
 win32build/VS2010/sqlite3_ds/sqlite3_ds.vcxproj    |    4 +-
 win32build/VS2010/static_ds/static_ds.vcxproj      |    4 +-
 .../statistics-tests/statistics-tests.vcxproj      |    2 +-
 win32build/VS2010/util-tests/util-tests.vcxproj    |    2 +-
 win32build/check/all                               |    5 +-
 win32build/check/debug-all                         |    5 +-
 win32build/check/dhcp6-all                         |    2 +
 win32build/check/dhcp6-debug                       |   27 +++
 win32build/check/dhcp6-release                     |   27 +++
 win32build/check/python-all                        |    2 +
 win32build/check/python-debug                      |  211 ++++++++++++++++++++
 win32build/check/python-release                    |  211 ++++++++++++++++++++
 win32build/check/release-all                       |    5 +-
 win32build/check/resolver-all                      |    2 +
 win32build/check/resolver-debug                    |    5 +
 win32build/check/resolver-release                  |    5 +
 win32build/check/site-debug                        |   10 +-
 win32build/check/site-release                      |    9 +-
 104 files changed, 809 insertions(+), 296 deletions(-)
 copy src/lib/{acl => dns/tests}/dll.h (77%)
 create mode 100755 src/lib/python/isc/log/tests/check_output-win32.sh
 copy win32build/VS2010/{libutil_unittests/libutil_unittests.vcxproj => libunittest_util/libunittest_util.vcxproj} (72%)
 copy win32build/VS2010/{datasrc-ftests/datasrc-ftests.vcxproj.filters => libunittest_util/libunittest_util.vcxproj.filters} (82%)
 copy win32build/VS2010/{BINDInstall/BINDInstall.vcxproj.user => libunittest_util/libunittest_util.vcxproj.user} (100%)
 create mode 100755 win32build/check/dhcp6-all
 create mode 100755 win32build/check/dhcp6-debug
 create mode 100755 win32build/check/dhcp6-release
 create mode 100755 win32build/check/python-all
 create mode 100755 win32build/check/python-debug
 create mode 100755 win32build/check/python-release
 create mode 100755 win32build/check/resolver-all
 create mode 100755 win32build/check/resolver-debug
 create mode 100755 win32build/check/resolver-release

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

diff --git a/WIN32-NOTES b/WIN32-NOTES
index 38e02de..4a41304 100644
--- a/WIN32-NOTES
+++ b/WIN32-NOTES
@@ -67,13 +67,13 @@ How to compile google test:
   for gtest and bind10
 
  - msvc gives the gtestd.dll (in place of gtest.dll) for the debug version
-  (a good thing when both Release and Debug are in path)
+  so you have to fix this
 
 How to compile botan:
 
  - works well with a (second) Python in version 2.x installed
 
- - modify the Debug (--enable-debug) Makefile to produce a botand.{dll,lib}
+ - modify the Debug (--enable-debug) Makefile to produce a botan.{dll,lib}
 
 How to recompile python:
 
@@ -110,12 +110,15 @@ Where I put things (hardwired paths):
 
  - <home>\gtest\include
 
- - <home>\gtest\v100\{Debug,Release} gtest{d,}.{dll,lib} and vc100.*
+ - <home>\gtest\v100\{Debug,Release}/gtest.{dll,lib} and vc100.*
 
- - <home>\botan\include and <home>\botan\v100\{Debug,Release}
-   (--disable-shared to get static libs, no DLL)
+ - <home>\botan\include
 
- - <home>\log4cplus\include and <home>\log4cplus\v100\{Debug,Release}
+ - <home>\botan\v100\{Debug,Release}/botan.{dll,lib}
+
+ - <home>\log4cplus\include
+
+ - <home>\log4cplus\v100\{Debug,Release}/log4cplus.{dll,lib}
 
  - "C:\Program Files (x86)\boost\boost_1_47" (the include and
   sometimes the libraries (in lib, called by the auto_link) too,
@@ -124,8 +127,8 @@ Where I put things (hardwired paths):
  - C:\Python32 (update your PATH, same for perl)
 
  - C:\sqlite3 (don't forget to copy the DLL in a place in the PATH,
-  on Window7 I can't get the permissions right but it works by putting
-  the DLL directory in the PATH)
+  on Window7 64 bits it is sysWOW64 in place of system32 but it works
+  too by putting the DLL directory in the PATH)
 
 How to compile:
 
diff --git a/src/lib/dns/tests/dll.h b/src/lib/dns/tests/dll.h
new file mode 100644
index 0000000..ae12f5f
--- /dev/null
+++ b/src/lib/dns/tests/dll.h
@@ -0,0 +1,32 @@
+// Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+// PERFORMANCE OF THIS SOFTWARE.
+
+#ifndef __LIBUNITTEST_UTIL_H
+#define __LIBUNITTEST_UTIL_H 1
+
+#if !defined(_WIN32) || defined(USE_STATIC_LINK)
+#define B10_LIBUNITTEST_UTIL_API
+#else
+#ifdef B10_LIBUNITTEST_UTIL_EXPORT
+#define B10_LIBUNITTEST_UTIL_API __declspec(dllexport)
+#else
+#define B10_LIBUNITTEST_UTIL_API __declspec(dllimport)
+#endif
+#endif
+
+#endif // __LIBUNITTEST_UTIL_H
+
+// Local Variables: 
+// mode: c++
+// End: 
diff --git a/src/lib/dns/tests/unittest_util.cc b/src/lib/dns/tests/unittest_util.cc
index 66d49a8..caaf90f 100644
--- a/src/lib/dns/tests/unittest_util.cc
+++ b/src/lib/dns/tests/unittest_util.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#define B10_LIBUNITTEST_UTIL_EXPORT
+
 #include <config.h>
 
 #include <iostream>
diff --git a/src/lib/dns/tests/unittest_util.h b/src/lib/dns/tests/unittest_util.h
index ebb514d..5eb1fd2 100644
--- a/src/lib/dns/tests/unittest_util.h
+++ b/src/lib/dns/tests/unittest_util.h
@@ -18,6 +18,7 @@
 #include <vector>
 #include <string>
 
+#include <dns/tests/dll.h>
 #include <dns/name.h>
 #include <dns/message.h>
 
@@ -25,7 +26,7 @@
 
 namespace isc {
 
-class UnitTestUtil {
+class B10_LIBUNITTEST_UTIL_API UnitTestUtil {
 public:
     ///
     /// read text format wire data from a file and put it to the given vector.
diff --git a/src/lib/python/isc/datasrc/__init__.py b/src/lib/python/isc/datasrc/__init__.py
index ea0c0a7..badf7b5 100644
--- a/src/lib/python/isc/datasrc/__init__.py
+++ b/src/lib/python/isc/datasrc/__init__.py
@@ -16,12 +16,15 @@ if sys.platform != 'win32':
 # having both 'normal' python modules and a wrapper module
 # Once all programs use the new interface, we should remove the
 # old, and the setup can be made similar to that of the log wrappers.
-intree = False
-for base in sys.path[:]:
-    datasrc_libdir = os.path.join(base, 'isc/datasrc/.libs')
-    if os.path.exists(datasrc_libdir):
-        sys.path.insert(0, datasrc_libdir)
-        intree = True
+if sys.platform != 'win32':
+    intree = False
+    for base in sys.path[:]:
+        datasrc_libdir = os.path.join(base, 'isc/datasrc/.libs')
+        if os.path.exists(datasrc_libdir):
+            sys.path.insert(0, datasrc_libdir)
+            intree = True
+else:
+    intree = True
 
 if intree:
     from datasrc import *
diff --git a/src/lib/python/isc/log/tests/check_output-win32.sh b/src/lib/python/isc/log/tests/check_output-win32.sh
new file mode 100755
index 0000000..d718e4a
--- /dev/null
+++ b/src/lib/python/isc/log/tests/check_output-win32.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+${PYTHON} "$1" 2>&1 | cut -d\  -f3- | diff -b - "$2" 1>&2
diff --git a/src/lib/python/isc/util/socketpair.py b/src/lib/python/isc/util/socketpair.py
index d45b34b..e12d971 100644
--- a/src/lib/python/isc/util/socketpair.py
+++ b/src/lib/python/isc/util/socketpair.py
@@ -20,7 +20,7 @@ import threading
 
 try:
     pairfamily = socket.AF_UNIX
-except NameError:
+except AttributeError:
     pairfamily = socket.AF_INET
 
 def socketpair(family=pairfamily, type_=socket.SOCK_STREAM, proto=0):
@@ -45,6 +45,6 @@ def socketpair(family=pairfamily, type_=socket.SOCK_STREAM, proto=0):
         psock.close()
         return (sock1, sock2)
 
-def pconnect_(sock.port):
+def pconnect_(sock, port):
     """connect helper"""
     sock.connect(('127.0.0.1', port))
diff --git a/src/lib/python/isc/util/socketserver_mixin.py b/src/lib/python/isc/util/socketserver_mixin.py
index 5f22229..0934b75 100644
--- a/src/lib/python/isc/util/socketserver_mixin.py
+++ b/src/lib/python/isc/util/socketserver_mixin.py
@@ -16,7 +16,7 @@
 import threading
 import socket
 import select
-from sys.util.socketpair import socketpair
+from socketpair import socketpair
 
 SOCK_DATA = b'somedata'
 class NoPollMixIn:
diff --git a/win32build/VS2010/_dns/_dns.vcxproj b/win32build/VS2010/_dns/_dns.vcxproj
index 57495b0..ee5ca68 100755
--- a/win32build/VS2010/_dns/_dns.vcxproj
+++ b/win32build/VS2010/_dns/_dns.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">
@@ -61,7 +61,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)_dns_d.pyd</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);C:\Python32\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-dns++d.lib;libb10-ccd.lib;libb10-acld.lib;libb10-dnsacld.lib;python32_d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-dns++.lib;libb10-cc.lib;libb10-acl.lib;libb10-dnsacl.lib;python32_d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/acl-tests/acl-tests.vcxproj b/win32build/VS2010/acl-tests/acl-tests.vcxproj
index cd469c3..bfa2191 100755
--- a/win32build/VS2010/acl-tests/acl-tests.vcxproj
+++ b/win32build/VS2010/acl-tests/acl-tests.vcxproj
@@ -61,7 +61,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;libb10-logd.lib;libb10-dns++d.lib;libb10-ccd.lib;libb10-acld.lib;libb10-dnsacld.lib;log4cplusD.lib;gtestd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-log.lib;libb10-dns++.lib;libb10-cc.lib;libb10-acl.lib;libb10-dnsacl.lib;log4cplus.lib;gtest.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/acl/acl.vcxproj b/win32build/VS2010/acl/acl.vcxproj
index eff5336..d3f0607 100755
--- a/win32build/VS2010/acl/acl.vcxproj
+++ b/win32build/VS2010/acl/acl.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">
@@ -61,7 +61,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)acl_d.pyd</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);C:\Python32\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-acld.lib;python32_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-acl.lib;python32_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/asiodns-tests/asiodns-tests.vcxproj b/win32build/VS2010/asiodns-tests/asiodns-tests.vcxproj
index b02e566..6ad431b 100755
--- a/win32build/VS2010/asiodns-tests/asiodns-tests.vcxproj
+++ b/win32build/VS2010/asiodns-tests/asiodns-tests.vcxproj
@@ -59,7 +59,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;libb10-cryptolinkd.lib;libb10-dns++d.lib;libb10-logd.lib;libb10-asiolinkd.lib;libb10-asiodnsd.lib;botand.lib;log4cplusD.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-cryptolink.lib;libb10-dns++.lib;libunittest_util.lib;libb10-log.lib;libb10-asiolink.lib;libb10-asiodns.lib;botan.lib;log4cplus.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%BOOST%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
@@ -81,7 +81,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-cryptolink.lib;libb10-dns++.lib;libb10-log.lib;libb10-asiolink.lib;libb10-asiodns.lib;botan.lib;log4cplus.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-cryptolink.lib;libb10-dns++.lib;libunittest_util.lib;libb10-log.lib;libb10-asiolink.lib;libb10-asiodns.lib;botan.lib;log4cplus.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%BOOST%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -90,10 +90,6 @@
     <ClCompile Include="..\..\..\src\lib\asiodns\tests\dns_service_unittest.cc" />
     <ClCompile Include="..\..\..\src\lib\asiodns\tests\io_fetch_unittest.cc" />
     <ClCompile Include="..\..\..\src\lib\asiodns\tests\run_unittests.cc" />
-    <ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/win32build/VS2010/asiodns-tests/asiodns-tests.vcxproj.filters b/win32build/VS2010/asiodns-tests/asiodns-tests.vcxproj.filters
index 1d919be..89d3611 100755
--- a/win32build/VS2010/asiodns-tests/asiodns-tests.vcxproj.filters
+++ b/win32build/VS2010/asiodns-tests/asiodns-tests.vcxproj.filters
@@ -24,16 +24,8 @@
     <ClCompile Include="..\..\..\src\lib\asiodns\tests\run_unittests.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\lib\asiodns\tests\dns_service_unittest.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/win32build/VS2010/asiolink-tests/asiolink-tests.vcxproj b/win32build/VS2010/asiolink-tests/asiolink-tests.vcxproj
index fb03caa..b49a8d3 100755
--- a/win32build/VS2010/asiolink-tests/asiolink-tests.vcxproj
+++ b/win32build/VS2010/asiolink-tests/asiolink-tests.vcxproj
@@ -60,7 +60,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;libb10-dns++d.lib;libb10-logd.lib;libb10-asiolinkd.lib;log4cplusD.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-dns++.lib;libb10-log.lib;libb10-asiolink.lib;log4cplus.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%BOOST%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
diff --git a/win32build/VS2010/b10-dhcp6/b10-dhcp6.vcxproj b/win32build/VS2010/b10-dhcp6/b10-dhcp6.vcxproj
index b7ac550..ddc02a0 100755
--- a/win32build/VS2010/b10-dhcp6/b10-dhcp6.vcxproj
+++ b/win32build/VS2010/b10-dhcp6/b10-dhcp6.vcxproj
@@ -59,7 +59,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)b10-dhcp6$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-logd.lib;libb10-ccd.lib;libb10-cfgclientd.lib;libb10-asiolinkd.lib;libb10-dhcp++d.lib;log4cplusD.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;libb10-cc.lib;libb10-cfgclient.lib;libb10-asiolink.lib;libb10-dhcp++.lib;log4cplus.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);%BOOST%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>
diff --git a/win32build/VS2010/b10-host/b10-host.vcxproj b/win32build/VS2010/b10-host/b10-host.vcxproj
index f8dbc48..815a607 100755
--- a/win32build/VS2010/b10-host/b10-host.vcxproj
+++ b/win32build/VS2010/b10-host/b10-host.vcxproj
@@ -61,7 +61,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)b10-host.exe</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-cryptolinkd.lib;libb10-dns++d.lib;botand.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-cryptolink.lib;libb10-dns++.lib;botan.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/b10-resolver/b10-resolver.vcxproj b/win32build/VS2010/b10-resolver/b10-resolver.vcxproj
index 092d21a..74913cd 100755
--- a/win32build/VS2010/b10-resolver/b10-resolver.vcxproj
+++ b/win32build/VS2010/b10-resolver/b10-resolver.vcxproj
@@ -61,10 +61,11 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)b10-resolver.exe</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);%BOOST%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-util-iod.lib;libb10-logd.lib;libb10-cryptolinkd.lib;libb10-dns++d.lib;libb10-ccd.lib;libb10-cfgclientd.lib;libb10-acld.lib;libb10-dnsacld.lib;libb10-asiolinkd.lib;libb10-asiodnsd.lib;libb10-nsasd.lib;libb10-cached.lib;libb10-resolved.lib;libb10-server-commond.lib;botand.lib;log4cplusD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-util-io.lib;libb10-log.lib;libb10-cryptolink.lib;libb10-dns++.lib;libb10-cc.lib;libb10-cfgclient.lib;libb10-acl.lib;libb10-dnsacl.lib;libb10-asiolink.lib;libb10-asiodns.lib;libb10-nsas.lib;libb10-cache.lib;libb10-resolve.lib;libb10-server-common.lib;botan.lib;log4cplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\bin\resolver
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\bin\resolver
 ..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe resolver_messages.mes
 copy resolver.spec.pre.win32 resolver.spec
 copy spec_config.h.pre.win32 spec_config.h
@@ -92,7 +93,8 @@ copy spec_config.h.pre.win32 spec_config.h
       <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-util-io.lib;libb10-log.lib;libb10-cryptolink.lib;libb10-dns++.lib;libb10-cc.lib;libb10-cfgclient.lib;libb10-acl.lib;libb10-dnsacl.lib;libb10-asiolink.lib;libb10-asiodns.lib;libb10-nsas.lib;libb10-cache.lib;libb10-resolve.lib;libb10-server-common.lib;botan.lib;log4cplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\bin\resolver
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\bin\resolver
 ..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe resolver_messages.mes
 copy resolver.spec.pre.win32 resolver.spec
 copy spec_config.h.pre.win32 spec_config.h
diff --git a/win32build/VS2010/badpacket-tests/badpacket-tests.vcxproj b/win32build/VS2010/badpacket-tests/badpacket-tests.vcxproj
index 66adc28..46c6e83 100755
--- a/win32build/VS2010/badpacket-tests/badpacket-tests.vcxproj
+++ b/win32build/VS2010/badpacket-tests/badpacket-tests.vcxproj
@@ -61,7 +61,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)run_unittests.exe</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/badpacket/badpacket.vcxproj b/win32build/VS2010/badpacket/badpacket.vcxproj
index a099367..c41ddf5 100755
--- a/win32build/VS2010/badpacket/badpacket.vcxproj
+++ b/win32build/VS2010/badpacket/badpacket.vcxproj
@@ -61,7 +61,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)badpacket.exe</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);%BOOST%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-logd.lib;libb10-cryptolinkd.lib;libb10-dns++d.lib;libb10-asiolinkd.lib;libb10-asiodnsd.lib;botand.lib;log4cplusD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;libb10-cryptolink.lib;libb10-dns++.lib;libb10-asiolink.lib;libb10-asiodns.lib;botan.lib;log4cplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/bench-example/bench-example.vcxproj b/win32build/VS2010/bench-example/bench-example.vcxproj
index 0f495c5..856be3f 100755
--- a/win32build/VS2010/bench-example/bench-example.vcxproj
+++ b/win32build/VS2010/bench-example/bench-example.vcxproj
@@ -59,7 +59,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libb10-exceptionsd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)search_bench$(TargetExt)</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
diff --git a/win32build/VS2010/bench-tests/bench-tests.vcxproj b/win32build/VS2010/bench-tests/bench-tests.vcxproj
index 6f170a4..fce482d 100755
--- a/win32build/VS2010/bench-tests/bench-tests.vcxproj
+++ b/win32build/VS2010/bench-tests/bench-tests.vcxproj
@@ -60,7 +60,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;libb10-cryptolinkd.lib;libb10-dns++d.lib;libb10-benchd.lib;botand.lib;gtestd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-cryptolink.lib;libb10-dns++.lib;libb10-bench.lib;botan.lib;gtest.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
diff --git a/win32build/VS2010/bind10.sln b/win32build/VS2010/bind10.sln
index 7753cfb..9157422 100755
--- a/win32build/VS2010/bind10.sln
+++ b/win32build/VS2010/bind10.sln
@@ -61,6 +61,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BINDInstall", "BINDInstall\
 		{F6E728D3-A0B2-40F6-9B91-7D4474D778F3} = {F6E728D3-A0B2-40F6-9B91-7D4474D778F3}
 		{FD0368DA-87CE-44D8-802B-9E755E95B493} = {FD0368DA-87CE-44D8-802B-9E755E95B493}
 		{564B0ADE-76A4-4833-9610-8DEEA6A15423} = {564B0ADE-76A4-4833-9610-8DEEA6A15423}
+		{357140E6-91CE-404C-BC96-D8AE23512B67} = {357140E6-91CE-404C-BC96-D8AE23512B67}
 		{7EB244E7-D381-4CF4-A2D4-739B81F77588} = {7EB244E7-D381-4CF4-A2D4-739B81F77588}
 		{C90961EC-3DDF-432F-8E3D-BDA06E4859D9} = {C90961EC-3DDF-432F-8E3D-BDA06E4859D9}
 		{66C9A5EC-514B-4BDC-AC74-ED4CB465CAAF} = {66C9A5EC-514B-4BDC-AC74-ED4CB465CAAF}
@@ -128,6 +129,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dns++-tests", "dns++-tests\
 		{13215E3E-E75D-463D-A0EF-93A1C9A20896} = {13215E3E-E75D-463D-A0EF-93A1C9A20896}
 		{8F120666-1A69-4506-8546-0F665E80FFB7} = {8F120666-1A69-4506-8546-0F665E80FFB7}
 		{F6E728D3-A0B2-40F6-9B91-7D4474D778F3} = {F6E728D3-A0B2-40F6-9B91-7D4474D778F3}
+		{357140E6-91CE-404C-BC96-D8AE23512B67} = {357140E6-91CE-404C-BC96-D8AE23512B67}
 		{2844FDFB-A0A1-4FA4-A654-15D69CC717DD} = {2844FDFB-A0A1-4FA4-A654-15D69CC717DD}
 	EndProjectSection
 EndProject
@@ -230,6 +232,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asiodns-tests", "asiodns-te
 		{13215E3E-E75D-463D-A0EF-93A1C9A20896} = {13215E3E-E75D-463D-A0EF-93A1C9A20896}
 		{8F120666-1A69-4506-8546-0F665E80FFB7} = {8F120666-1A69-4506-8546-0F665E80FFB7}
 		{F6E728D3-A0B2-40F6-9B91-7D4474D778F3} = {F6E728D3-A0B2-40F6-9B91-7D4474D778F3}
+		{357140E6-91CE-404C-BC96-D8AE23512B67} = {357140E6-91CE-404C-BC96-D8AE23512B67}
 		{7EB244E7-D381-4CF4-A2D4-739B81F77588} = {7EB244E7-D381-4CF4-A2D4-739B81F77588}
 		{2844FDFB-A0A1-4FA4-A654-15D69CC717DD} = {2844FDFB-A0A1-4FA4-A654-15D69CC717DD}
 		{AEF3DFFE-B566-4E6A-B299-B59B81022C06} = {AEF3DFFE-B566-4E6A-B299-B59B81022C06}
@@ -276,6 +279,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cache-tests", "cache-tests\
 		{8F120666-1A69-4506-8546-0F665E80FFB7} = {8F120666-1A69-4506-8546-0F665E80FFB7}
 		{F8616086-9CE9-4F32-BC97-8494EADAEC6F} = {F8616086-9CE9-4F32-BC97-8494EADAEC6F}
 		{F6E728D3-A0B2-40F6-9B91-7D4474D778F3} = {F6E728D3-A0B2-40F6-9B91-7D4474D778F3}
+		{357140E6-91CE-404C-BC96-D8AE23512B67} = {357140E6-91CE-404C-BC96-D8AE23512B67}
 		{2844FDFB-A0A1-4FA4-A654-15D69CC717DD} = {2844FDFB-A0A1-4FA4-A654-15D69CC717DD}
 		{AEF3DFFE-B566-4E6A-B299-B59B81022C06} = {AEF3DFFE-B566-4E6A-B299-B59B81022C06}
 	EndProjectSection
@@ -303,6 +307,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "resolve-tests", "resolve-te
 		{8F120666-1A69-4506-8546-0F665E80FFB7} = {8F120666-1A69-4506-8546-0F665E80FFB7}
 		{F8616086-9CE9-4F32-BC97-8494EADAEC6F} = {F8616086-9CE9-4F32-BC97-8494EADAEC6F}
 		{F6E728D3-A0B2-40F6-9B91-7D4474D778F3} = {F6E728D3-A0B2-40F6-9B91-7D4474D778F3}
+		{357140E6-91CE-404C-BC96-D8AE23512B67} = {357140E6-91CE-404C-BC96-D8AE23512B67}
 		{7EB244E7-D381-4CF4-A2D4-739B81F77588} = {7EB244E7-D381-4CF4-A2D4-739B81F77588}
 		{2844FDFB-A0A1-4FA4-A654-15D69CC717DD} = {2844FDFB-A0A1-4FA4-A654-15D69CC717DD}
 		{AEF3DFFE-B566-4E6A-B299-B59B81022C06} = {AEF3DFFE-B566-4E6A-B299-B59B81022C06}
@@ -315,6 +320,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libb10-testutils", "libb10-
 		{8F120666-1A69-4506-8546-0F665E80FFB7} = {8F120666-1A69-4506-8546-0F665E80FFB7}
 		{761E7D88-6CCB-4E41-9F1E-6C1FBBD062F5} = {761E7D88-6CCB-4E41-9F1E-6C1FBBD062F5}
 		{F6E728D3-A0B2-40F6-9B91-7D4474D778F3} = {F6E728D3-A0B2-40F6-9B91-7D4474D778F3}
+		{357140E6-91CE-404C-BC96-D8AE23512B67} = {357140E6-91CE-404C-BC96-D8AE23512B67}
 		{7EB244E7-D381-4CF4-A2D4-739B81F77588} = {7EB244E7-D381-4CF4-A2D4-739B81F77588}
 		{66C9A5EC-514B-4BDC-AC74-ED4CB465CAAF} = {66C9A5EC-514B-4BDC-AC74-ED4CB465CAAF}
 		{CC29C1F9-A77B-476C-803E-8830F8312571} = {CC29C1F9-A77B-476C-803E-8830F8312571}
@@ -340,6 +346,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "datasrc-tests", "datasrc-te
 		{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}
+		{357140E6-91CE-404C-BC96-D8AE23512B67} = {357140E6-91CE-404C-BC96-D8AE23512B67}
 		{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}
@@ -507,6 +514,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "datasrc", "datasrc\datasrc.
 		{7D04222B-643C-446C-A2B8-93AF74A86246} = {7D04222B-643C-446C-A2B8-93AF74A86246}
 		{13215E3E-E75D-463D-A0EF-93A1C9A20896} = {13215E3E-E75D-463D-A0EF-93A1C9A20896}
 		{8F120666-1A69-4506-8546-0F665E80FFB7} = {8F120666-1A69-4506-8546-0F665E80FFB7}
+		{2E64F6CC-3AD9-4DA7-8E05-ABBB83F9AFC4} = {2E64F6CC-3AD9-4DA7-8E05-ABBB83F9AFC4}
 		{F6E728D3-A0B2-40F6-9B91-7D4474D778F3} = {F6E728D3-A0B2-40F6-9B91-7D4474D778F3}
 		{CC29C1F9-A77B-476C-803E-8830F8312571} = {CC29C1F9-A77B-476C-803E-8830F8312571}
 		{AEF3DFFE-B566-4E6A-B299-B59B81022C06} = {AEF3DFFE-B566-4E6A-B299-B59B81022C06}
@@ -587,6 +595,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "resolver-tests", "resolver-
 		{EB54F7B8-FAEF-4348-989C-D4E6B42CEFB1} = {EB54F7B8-FAEF-4348-989C-D4E6B42CEFB1}
 		{813BA1C9-8CD8-4B06-B1C0-FDAB576AC4B6} = {813BA1C9-8CD8-4B06-B1C0-FDAB576AC4B6}
 		{F6E728D3-A0B2-40F6-9B91-7D4474D778F3} = {F6E728D3-A0B2-40F6-9B91-7D4474D778F3}
+		{357140E6-91CE-404C-BC96-D8AE23512B67} = {357140E6-91CE-404C-BC96-D8AE23512B67}
 		{7EB244E7-D381-4CF4-A2D4-739B81F77588} = {7EB244E7-D381-4CF4-A2D4-739B81F77588}
 		{66C9A5EC-514B-4BDC-AC74-ED4CB465CAAF} = {66C9A5EC-514B-4BDC-AC74-ED4CB465CAAF}
 		{CC29C1F9-A77B-476C-803E-8830F8312571} = {CC29C1F9-A77B-476C-803E-8830F8312571}
@@ -697,11 +706,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "datasrc-ftests", "datasrc-f
 		{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}
+		{357140E6-91CE-404C-BC96-D8AE23512B67} = {357140E6-91CE-404C-BC96-D8AE23512B67}
 		{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
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libunittest_util", "libunittest_util\libunittest_util.vcxproj", "{357140E6-91CE-404C-BC96-D8AE23512B67}"
+	ProjectSection(ProjectDependencies) = postProject
+		{F6E728D3-A0B2-40F6-9B91-7D4474D778F3} = {F6E728D3-A0B2-40F6-9B91-7D4474D778F3}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -992,6 +1007,10 @@ Global
 		{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
+		{357140E6-91CE-404C-BC96-D8AE23512B67}.Debug|Win32.ActiveCfg = Debug|Win32
+		{357140E6-91CE-404C-BC96-D8AE23512B67}.Debug|Win32.Build.0 = Debug|Win32
+		{357140E6-91CE-404C-BC96-D8AE23512B67}.Release|Win32.ActiveCfg = Release|Win32
+		{357140E6-91CE-404C-BC96-D8AE23512B67}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/win32build/VS2010/cache-tests/cache-tests.vcxproj b/win32build/VS2010/cache-tests/cache-tests.vcxproj
index fb296c0..af8a6be 100755
--- a/win32build/VS2010/cache-tests/cache-tests.vcxproj
+++ b/win32build/VS2010/cache-tests/cache-tests.vcxproj
@@ -60,7 +60,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;libb10-logd.lib;libb10-cryptolinkd.lib;libb10-dns++d.lib;libb10-asiolinkd.lib;libb10-nsasd.lib;libb10-cached.lib;botand.lib;log4cplusD.lib;gtestd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-log.lib;libb10-cryptolink.lib;libb10-dns++.lib;libunittest_util.lib;libb10-asiolink.lib;libb10-nsas.lib;libb10-cache.lib;botan.lib;log4cplus.lib;gtest.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -81,14 +81,13 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-log.lib;libb10-cryptolink.lib;libb10-dns++.lib;libb10-asiolink.lib;libb10-nsas.lib;libb10-cache.lib;botan.lib;log4cplus.lib;gtest.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-log.lib;libb10-cryptolink.lib;libb10-dns++.lib;libunittest_util.lib;libb10-asiolink.lib;libb10-nsas.lib;libb10-cache.lib;botan.lib;log4cplus.lib;gtest.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\lib\cache\tests\cache_test_messagefromfile.h" />
     <ClInclude Include="..\..\..\src\lib\cache\tests\cache_test_sectioncount.h" />
-    <ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\lib\cache\tests\local_zone_data_unittest.cc" />
@@ -99,7 +98,6 @@
     <ClCompile Include="..\..\..\src\lib\cache\tests\rrset_cache_unittest.cc" />
     <ClCompile Include="..\..\..\src\lib\cache\tests\rrset_entry_unittest.cc" />
     <ClCompile Include="..\..\..\src\lib\cache\tests\run_unittests.cc" />
-    <ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/win32build/VS2010/cache-tests/cache-tests.vcxproj.filters b/win32build/VS2010/cache-tests/cache-tests.vcxproj.filters
index 7ce824d..2e9a85f 100755
--- a/win32build/VS2010/cache-tests/cache-tests.vcxproj.filters
+++ b/win32build/VS2010/cache-tests/cache-tests.vcxproj.filters
@@ -21,9 +21,6 @@
     <ClInclude Include="..\..\..\src\lib\cache\tests\cache_test_sectioncount.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\lib\cache\tests\local_zone_data_unittest.cc">
@@ -50,8 +47,5 @@
     <ClCompile Include="..\..\..\src\lib\cache\tests\run_unittests.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/win32build/VS2010/cc-tests/cc-tests.vcxproj b/win32build/VS2010/cc-tests/cc-tests.vcxproj
index 0bdef2a..23b3046 100755
--- a/win32build/VS2010/cc-tests/cc-tests.vcxproj
+++ b/win32build/VS2010/cc-tests/cc-tests.vcxproj
@@ -60,7 +60,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;libb10-logd.lib;libb10-ccd.lib;log4cplusD.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-log.lib;libb10-cc.lib;log4cplus.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%BOOST%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>
diff --git a/win32build/VS2010/config-tests/config-tests.vcxproj b/win32build/VS2010/config-tests/config-tests.vcxproj
index 7ad2a48..8330a4c 100755
--- a/win32build/VS2010/config-tests/config-tests.vcxproj
+++ b/win32build/VS2010/config-tests/config-tests.vcxproj
@@ -60,7 +60,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;libb10-logd.lib;libb10-ccd.lib;libb10-cfgclientd.lib;libfake_sessiond.lib;log4cplusD.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-log.lib;libb10-cc.lib;libb10-cfgclient.lib;libfake_session.lib;log4cplus.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>
diff --git a/win32build/VS2010/cryptolink-tests/cryptolink-tests.vcxproj b/win32build/VS2010/cryptolink-tests/cryptolink-tests.vcxproj
index 091c0ca..daed28c 100755
--- a/win32build/VS2010/cryptolink-tests/cryptolink-tests.vcxproj
+++ b/win32build/VS2010/cryptolink-tests/cryptolink-tests.vcxproj
@@ -60,7 +60,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;libb10-cryptolinkd.lib;gtestd.lib;botand.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-cryptolink.lib;gtest.lib;botan.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
diff --git a/win32build/VS2010/datasrc-ftests/datasrc-ftests.vcxproj b/win32build/VS2010/datasrc-ftests/datasrc-ftests.vcxproj
index 194d8a8..b1764bd 100755
--- a/win32build/VS2010/datasrc-ftests/datasrc-ftests.vcxproj
+++ b/win32build/VS2010/datasrc-ftests/datasrc-ftests.vcxproj
@@ -60,7 +60,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;libb10-logd.lib;libb10-dns++d.lib;libb10-ccd.lib;libb10-testutilsd.lib;libb10-datasrcd.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-log.lib;libb10-dns++.lib;libunittest_util.lib;libb10-cc.lib;libb10-testutils.lib;libb10-datasrc.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -80,16 +80,12 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-log.lib;libb10-dns++.lib;libb10-cc.lib;libb10-testutils.lib;libb10-datasrc.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-log.lib;libb10-dns++.lib;libunittest_util.lib;libb10-cc.lib;libb10-testutils.lib;libb10-datasrc.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h" />
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\factory_unittest.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\run_unittests.cc" />
-    <ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/win32build/VS2010/datasrc-ftests/datasrc-ftests.vcxproj.filters b/win32build/VS2010/datasrc-ftests/datasrc-ftests.vcxproj.filters
index 62e1cd7..a10c463 100755
--- a/win32build/VS2010/datasrc-ftests/datasrc-ftests.vcxproj.filters
+++ b/win32build/VS2010/datasrc-ftests/datasrc-ftests.vcxproj.filters
@@ -15,14 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\run_unittests.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/win32build/VS2010/datasrc-tests/datasrc-tests.vcxproj b/win32build/VS2010/datasrc-tests/datasrc-tests.vcxproj
index fe019f2..0f21d41 100755
--- a/win32build/VS2010/datasrc-tests/datasrc-tests.vcxproj
+++ b/win32build/VS2010/datasrc-tests/datasrc-tests.vcxproj
@@ -60,7 +60,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;libb10-logd.lib;libb10-cryptolinkd.lib;libb10-dns++d.lib;libb10-ccd.lib;libb10-testutilsd.lib;libb10-datasrcd.lib;botand.lib;log4cplusD.lib;gtestd.lib;sqlite3.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-log.lib;libb10-cryptolink.lib;libb10-dns++.lib;libunittest_util.lib;libb10-cc.lib;libb10-testutils.lib;libb10-datasrc.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>
@@ -85,7 +85,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-log.lib;libb10-cryptolink.lib;libb10-dns++.lib;libb10-cc.lib;libb10-testutils.lib;libb10-datasrc.lib;botan.lib;log4cplus.lib;gtest.lib;sqlite3.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-log.lib;libb10-cryptolink.lib;libb10-dns++.lib;libunittest_util.lib;libb10-cc.lib;libb10-testutils.lib;libb10-datasrc.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>
@@ -101,7 +101,6 @@
     <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" />
@@ -127,7 +126,6 @@
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\test_datasrc.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\zonetable_unittest.cc" />
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\zone_finder_context_unittest.cc" />
-    <ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/win32build/VS2010/datasrc-tests/datasrc-tests.vcxproj.filters b/win32build/VS2010/datasrc-tests/datasrc-tests.vcxproj.filters
index 36745b2..29eab73 100755
--- a/win32build/VS2010/datasrc-tests/datasrc-tests.vcxproj.filters
+++ b/win32build/VS2010/datasrc-tests/datasrc-tests.vcxproj.filters
@@ -18,9 +18,6 @@
     <ClInclude Include="..\..\..\src\lib\datasrc\tests\test_datasrc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\lib\datasrc\tests\faked_nsec3.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -71,9 +68,6 @@
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\zonetable_unittest.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\lib\datasrc\tests\client_unittest.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/win32build/VS2010/datasrc/datasrc.vcxproj b/win32build/VS2010/datasrc/datasrc.vcxproj
index 73dc2cb..631deb3 100755
--- a/win32build/VS2010/datasrc/datasrc.vcxproj
+++ b/win32build/VS2010/datasrc/datasrc.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">
@@ -61,8 +61,20 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)datasrc_d.pyd</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);C:\Python32\libs;C:\sqlite3;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-logd.lib;libb10-cryptolinkd.lib;libb10-dns++d.lib;libb10-pydnsppd.lib;libb10-ccd.lib;libb10-datasrcd.lib;botand.lib;log4cplusD.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;libb10-cryptolink.lib;libb10-dns++.lib;libb10-pydnspp.lib;libb10-cc.lib;libb10-datasrc.lib;botan.lib;log4cplus.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <PostBuildEvent>
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\python\isc
+copy log_messages\work\__init__.py.in  log_messages\work\__init__.py
+..\..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe -d log_messages\work -p config\cfgmgr_messages.mes
+..\..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe -d log_messages\work -p config\config_messages.mes
+..\..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe -d log_messages\work -p notify\notify_out_messages.mes
+..\..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe -d log_messages\work -p xfrin\libxfrin_messages.mes
+..\..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe -d log_messages\work -p server_common\server_common_messages.mes
+..\..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe -d log_messages\work -p ddns\libddns_messages.mes
+</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -84,6 +96,18 @@
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);C:\Python32\libs;C:\sqlite3;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;libb10-cryptolink.lib;libb10-dns++.lib;libb10-pydnspp.lib;libb10-cc.lib;libb10-datasrc.lib;botan.lib;log4cplus.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <PostBuildEvent>
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\python\isc
+copy log_messages\work\__init__.py.in  log_messages\work\__init__.py
+..\..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe -d log_messages\work -p config\cfgmgr_messages.mes
+..\..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe -d log_messages\work -p config\config_messages.mes
+..\..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe -d log_messages\work -p notify\notify_out_messages.mes
+..\..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe -d log_messages\work -p xfrin\libxfrin_messages.mes
+..\..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe -d log_messages\work -p server_common\server_common_messages.mes
+..\..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe -d log_messages\work -p ddns\libddns_messages.mes
+</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\lib\python\isc\datasrc\client_inc.cc" />
diff --git a/win32build/VS2010/dhcp++-tests/dhcp++-tests.vcxproj b/win32build/VS2010/dhcp++-tests/dhcp++-tests.vcxproj
index 4c795c3..f20129d 100755
--- a/win32build/VS2010/dhcp++-tests/dhcp++-tests.vcxproj
+++ b/win32build/VS2010/dhcp++-tests/dhcp++-tests.vcxproj
@@ -60,7 +60,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;libb10-logd.lib;libb10-asiolinkd.lib;libb10-dhcp++d.lib;log4cplusD.lib;gtestd.lib;%(AdditionalDependencies);iphlpapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-log.lib;libb10-asiolink.lib;libb10-dhcp++.lib;log4cplus.lib;gtest.lib;%(AdditionalDependencies);iphlpapi.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%BOOST%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
diff --git a/win32build/VS2010/dhcp6-tests/dhcp6-tests.vcxproj b/win32build/VS2010/dhcp6-tests/dhcp6-tests.vcxproj
index 5298cd3..93dbfdd 100755
--- a/win32build/VS2010/dhcp6-tests/dhcp6-tests.vcxproj
+++ b/win32build/VS2010/dhcp6-tests/dhcp6-tests.vcxproj
@@ -61,7 +61,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)dhcp6_unittests$(TargetExt)</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%BOOST%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;libb10-logd.lib;libb10-ccd.lib;libb10-cfgclientd.lib;libb10-asiolinkd.lib;libb10-dhcp++d.lib;log4cplusD.lib;gtestd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-log.lib;libb10-cc.lib;libb10-cfgclient.lib;libb10-asiolink.lib;libb10-dhcp++.lib;log4cplus.lib;gtest.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/dns++-mbench/dns++-mbench.vcxproj b/win32build/VS2010/dns++-mbench/dns++-mbench.vcxproj
index 23eac28..f6630d7 100755
--- a/win32build/VS2010/dns++-mbench/dns++-mbench.vcxproj
+++ b/win32build/VS2010/dns++-mbench/dns++-mbench.vcxproj
@@ -61,7 +61,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)message_renderer_bench$(TargetExt)</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-dns++d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-dns++.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/dns++-rbench/dns++-rbench.vcxproj b/win32build/VS2010/dns++-rbench/dns++-rbench.vcxproj
index 8879b31..c98b32e 100755
--- a/win32build/VS2010/dns++-rbench/dns++-rbench.vcxproj
+++ b/win32build/VS2010/dns++-rbench/dns++-rbench.vcxproj
@@ -60,7 +60,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)rdatarender_bench$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-dns++d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-dns++.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
diff --git a/win32build/VS2010/dns++-tests/dns++-tests.vcxproj b/win32build/VS2010/dns++-tests/dns++-tests.vcxproj
index 075e6d8..1f838c3 100755
--- a/win32build/VS2010/dns++-tests/dns++-tests.vcxproj
+++ b/win32build/VS2010/dns++-tests/dns++-tests.vcxproj
@@ -59,7 +59,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;libb10-cryptolinkd.lib;libb10-dns++d.lib;gtestd.lib;botand.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-cryptolink.lib;libb10-dns++.lib;libunittest_util.lib;gtest.lib;botan.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);..\..\..\..\botan\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>
@@ -200,7 +200,7 @@ python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify9.wire tsi
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-cryptolink.lib;libb10-dns++.lib;gtest.lib;botan.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-cryptolink.lib;libb10-dns++.lib;libunittest_util.lib;gtest.lib;botan.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);..\..\..\..\botan\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>
@@ -327,7 +327,6 @@ python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify9.wire tsi
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\lib\dns\tests\rdata_unittest.h" />
-    <ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\lib\dns\tests\character_string_unittest.cc" />
@@ -382,7 +381,6 @@ python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify9.wire tsi
     <ClCompile Include="..\..\..\src\lib\dns\tests\tsigkey_unittest.cc" />
     <ClCompile Include="..\..\..\src\lib\dns\tests\tsigrecord_unittest.cc" />
     <ClCompile Include="..\..\..\src\lib\dns\tests\tsig_unittest.cc" />
-    <ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/win32build/VS2010/dns++-tests/dns++-tests.vcxproj.filters b/win32build/VS2010/dns++-tests/dns++-tests.vcxproj.filters
index 243bc3f..64546a3 100755
--- a/win32build/VS2010/dns++-tests/dns++-tests.vcxproj.filters
+++ b/win32build/VS2010/dns++-tests/dns++-tests.vcxproj.filters
@@ -18,9 +18,6 @@
     <ClInclude Include="..\..\..\src\lib\dns\tests\rdata_unittest.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\lib\dns\tests\edns_unittest.cc">
@@ -134,9 +131,6 @@
     <ClCompile Include="..\..\..\src\lib\dns\tests\tsigkey_unittest.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\lib\dns\tests\character_string_unittest.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/win32build/VS2010/exceptions-tests/exceptions-tests.vcxproj b/win32build/VS2010/exceptions-tests/exceptions-tests.vcxproj
index 919168b..bfdf229 100755
--- a/win32build/VS2010/exceptions-tests/exceptions-tests.vcxproj
+++ b/win32build/VS2010/exceptions-tests/exceptions-tests.vcxproj
@@ -60,7 +60,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptionsd.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
diff --git a/win32build/VS2010/libb10-acl/libb10-acl.vcxproj b/win32build/VS2010/libb10-acl/libb10-acl.vcxproj
index 4fe31cd..5f2ed33 100755
--- a/win32build/VS2010/libb10-acl/libb10-acl.vcxproj
+++ b/win32build/VS2010/libb10-acl/libb10-acl.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,7 +51,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -66,7 +66,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-ccd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-cc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/libb10-asiodns/libb10-asiodns.vcxproj b/win32build/VS2010/libb10-asiodns/libb10-asiodns.vcxproj
index 0aafc2d..558eb06 100755
--- a/win32build/VS2010/libb10-asiodns/libb10-asiodns.vcxproj
+++ b/win32build/VS2010/libb10-asiodns/libb10-asiodns.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,7 +62,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -77,10 +77,11 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);%BOOST%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-logd.lib;libb10-dns++d.lib;libb10-asiolinkd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;libb10-dns++.lib;libb10-asiolink.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\lib\asiodns
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\asiodns
 ..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe asiodns_messages.mes
 </Command>
     </PreBuildEvent>
@@ -105,7 +106,8 @@
       <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;libb10-dns++.lib;libb10-asiolink.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\lib\asiodns
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\asiodns
 ..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe asiodns_messages.mes
 </Command>
     </PreBuildEvent>
diff --git a/win32build/VS2010/libb10-asiolink/libb10-asiolink.vcxproj b/win32build/VS2010/libb10-asiolink/libb10-asiolink.vcxproj
index 5febbd4..a6676b3 100755
--- a/win32build/VS2010/libb10-asiolink/libb10-asiolink.vcxproj
+++ b/win32build/VS2010/libb10-asiolink/libb10-asiolink.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,7 +68,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -83,7 +83,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);%BOOST%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-logd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-log.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/libb10-bench/libb10-bench.vcxproj b/win32build/VS2010/libb10-bench/libb10-bench.vcxproj
index 5ec83c5..ba5b650 100755
--- a/win32build/VS2010/libb10-bench/libb10-bench.vcxproj
+++ b/win32build/VS2010/libb10-bench/libb10-bench.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,7 +47,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -62,7 +62,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-dns++d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-dns++.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/libb10-cache/libb10-cache.vcxproj b/win32build/VS2010/libb10-cache/libb10-cache.vcxproj
index 04f4009..e69a512 100755
--- a/win32build/VS2010/libb10-cache/libb10-cache.vcxproj
+++ b/win32build/VS2010/libb10-cache/libb10-cache.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,7 +66,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -81,10 +81,11 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-logd.lib;libb10-dns++d.lib;libb10-nsasd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;libb10-dns++.lib;libb10-nsas.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\lib\cache
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\cache
 ..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe cache_messages.mes
 </Command>
     </PreBuildEvent>
@@ -109,7 +110,8 @@
       <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;libb10-dns++.lib;libb10-nsas.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\lib\cache
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\cache
 ..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe cache_messages.mes
 </Command>
     </PreBuildEvent>
@@ -117,4 +119,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libb10-cc/libb10-cc.vcxproj b/win32build/VS2010/libb10-cc/libb10-cc.vcxproj
index 0d4321a..e5a658a 100755
--- a/win32build/VS2010/libb10-cc/libb10-cc.vcxproj
+++ b/win32build/VS2010/libb10-cc/libb10-cc.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,7 +53,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -68,10 +68,11 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);%BOOST%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-logd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-log.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\lib\cc
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\cc
 copy session_config.h.win32 session_config.h
 ..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe cc_messages.mes
 
@@ -98,7 +99,8 @@ copy session_config.h.win32 session_config.h
       <AdditionalDependencies>libb10-exceptions.lib;libb10-log.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\lib\cc
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\cc
 copy session_config.h.win32 session_config.h
 ..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe cc_messages.mes
 
diff --git a/win32build/VS2010/libb10-cfgclient/libb10-cfgclient.vcxproj b/win32build/VS2010/libb10-cfgclient/libb10-cfgclient.vcxproj
index fa54cac..1815aad 100755
--- a/win32build/VS2010/libb10-cfgclient/libb10-cfgclient.vcxproj
+++ b/win32build/VS2010/libb10-cfgclient/libb10-cfgclient.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,7 +56,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -71,10 +71,11 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-logd.lib;libb10-ccd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-log.lib;libb10-cc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\lib\config
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\config
 ..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe config_messages.mes
 </Command>
     </PreBuildEvent>
@@ -99,7 +100,8 @@
       <AdditionalDependencies>libb10-exceptions.lib;libb10-log.lib;libb10-cc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\lib\config
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\config
 ..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe config_messages.mes
 </Command>
     </PreBuildEvent>
diff --git a/win32build/VS2010/libb10-cryptolink/libb10-cryptolink.vcxproj b/win32build/VS2010/libb10-cryptolink/libb10-cryptolink.vcxproj
index 01f4816..da34d2a 100755
--- a/win32build/VS2010/libb10-cryptolink/libb10-cryptolink.vcxproj
+++ b/win32build/VS2010/libb10-cryptolink/libb10-cryptolink.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,7 +48,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -63,7 +63,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;botand.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;botan.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/libb10-datasrc/libb10-datasrc.vcxproj b/win32build/VS2010/libb10-datasrc/libb10-datasrc.vcxproj
index 0a156c7..8e2170c 100755
--- a/win32build/VS2010/libb10-datasrc/libb10-datasrc.vcxproj
+++ b/win32build/VS2010/libb10-datasrc/libb10-datasrc.vcxproj
@@ -74,7 +74,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -89,12 +89,13 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);C:\sqlite3;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-logd.lib;libb10-dns++d.lib;libb10-ccd.lib;libb10-cached.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;libb10-dns++.lib;libb10-cc.lib;libb10-cache.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\lib\datasrc
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\datasrc
 ..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe datasrc_messages.mes
 copy datasrc_config.h.pre.win32 datasrc_config.h
 copy static.zone.pre static.zone
@@ -126,7 +127,8 @@ copy static.zone.win32 static.zone
       <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;libb10-dns++.lib;libb10-cc.lib;libb10-cache.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\lib\datasrc
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\datasrc
 ..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe datasrc_messages.mes
 copy datasrc_config.h.pre.win32 datasrc_config.h
 copy static.zone.pre static.zone
diff --git a/win32build/VS2010/libb10-dhcp++/libb10-dhcp++.vcxproj b/win32build/VS2010/libb10-dhcp++/libb10-dhcp++.vcxproj
index 8ca2d4a..8103cd4 100755
--- a/win32build/VS2010/libb10-dhcp++/libb10-dhcp++.vcxproj
+++ b/win32build/VS2010/libb10-dhcp++/libb10-dhcp++.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,7 +68,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -83,7 +83,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);%BOOST%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-asiolinkd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-asiolink.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/libb10-dns++/libb10-dns++.vcxproj b/win32build/VS2010/libb10-dns++/libb10-dns++.vcxproj
index a2cde68..b249d53 100755
--- a/win32build/VS2010/libb10-dns++/libb10-dns++.vcxproj
+++ b/win32build/VS2010/libb10-dns++/libb10-dns++.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,7 +103,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -118,7 +118,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-cryptolinkd.lib;botand.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-cryptolink.lib;botan.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
       <Command>cd ..\..\..\src\lib\dns
diff --git a/win32build/VS2010/libb10-dnsacl/libb10-dnsacl.vcxproj b/win32build/VS2010/libb10-dnsacl/libb10-dnsacl.vcxproj
index d0974b9..a2bc9bb 100755
--- a/win32build/VS2010/libb10-dnsacl/libb10-dnsacl.vcxproj
+++ b/win32build/VS2010/libb10-dnsacl/libb10-dnsacl.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,7 +47,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -62,7 +62,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-dns++d.lib;libb10-ccd.lib;libb10-acld.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-dns++.lib;libb10-cc.lib;libb10-acl.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/libb10-exceptions/libb10-exceptions.vcxproj b/win32build/VS2010/libb10-exceptions/libb10-exceptions.vcxproj
index f712741..dd3dd8e 100755
--- a/win32build/VS2010/libb10-exceptions/libb10-exceptions.vcxproj
+++ b/win32build/VS2010/libb10-exceptions/libb10-exceptions.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,7 +45,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/win32build/VS2010/libb10-log/libb10-log.vcxproj b/win32build/VS2010/libb10-log/libb10-log.vcxproj
index 5cac0e1..1187667 100755
--- a/win32build/VS2010/libb10-log/libb10-log.vcxproj
+++ b/win32build/VS2010/libb10-log/libb10-log.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,7 +83,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -98,7 +98,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;log4cplusD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;log4cplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/libb10-nsas/libb10-nsas.vcxproj b/win32build/VS2010/libb10-nsas/libb10-nsas.vcxproj
index 222968f..ac09418 100755
--- a/win32build/VS2010/libb10-nsas/libb10-nsas.vcxproj
+++ b/win32build/VS2010/libb10-nsas/libb10-nsas.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,7 +72,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -87,10 +87,11 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-logd.lib;libb10-dns++d.lib;libb10-asiolinkd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;libb10-dns++.lib;libb10-asiolink.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\lib\nsas
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\nsas
 ..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe nsas_messages.mes
 </Command>
     </PreBuildEvent>
@@ -115,7 +116,8 @@
       <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;libb10-dns++.lib;libb10-asiolink.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\lib\nsas
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\nsas
 ..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe nsas_messages.mes
 </Command>
     </PreBuildEvent>
diff --git a/win32build/VS2010/libb10-pydnspp/libb10-pydnspp.vcxproj b/win32build/VS2010/libb10-pydnspp/libb10-pydnspp.vcxproj
index 433d26f..99afcc4 100755
--- a/win32build/VS2010/libb10-pydnspp/libb10-pydnspp.vcxproj
+++ b/win32build/VS2010/libb10-pydnspp/libb10-pydnspp.vcxproj
@@ -89,7 +89,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(Solutiondir)$(Configuration)\</OutDir>
@@ -107,7 +107,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);C:\Python32\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-dns++d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-dns++.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/libb10-resolve/libb10-resolve.vcxproj b/win32build/VS2010/libb10-resolve/libb10-resolve.vcxproj
index ad1abf0..bfd3c69 100755
--- a/win32build/VS2010/libb10-resolve/libb10-resolve.vcxproj
+++ b/win32build/VS2010/libb10-resolve/libb10-resolve.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,7 +57,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -72,10 +72,11 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(configuration);%BOOST%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-logd.lib;libb10-dns++d.lib;libb10-asiolinkd.lib;libb10-asiodnsd.lib;libb10-nsasd.lib;libb10-cached.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;libb10-dns++.lib;libb10-asiolink.lib;libb10-asiodns.lib;libb10-nsas.lib;libb10-cache.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\lib\resolve
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\resolve
 ..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe resolve_messages.mes
 </Command>
     </PreBuildEvent>
@@ -100,7 +101,8 @@
       <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;libb10-dns++.lib;libb10-asiolink.lib;libb10-asiodns.lib;libb10-nsas.lib;libb10-cache.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\lib\resolve
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\resolve
 ..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe resolve_messages.mes
 </Command>
     </PreBuildEvent>
diff --git a/win32build/VS2010/libb10-server-common/libb10-server-common.vcxproj b/win32build/VS2010/libb10-server-common/libb10-server-common.vcxproj
index 8444313..734a24f 100755
--- a/win32build/VS2010/libb10-server-common/libb10-server-common.vcxproj
+++ b/win32build/VS2010/libb10-server-common/libb10-server-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,7 +54,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -69,10 +69,11 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-util-iod.lib;libb10-logd.lib;libb10-dns++d.lib;libb10-ccd.lib;libb10-cfgclientd.lib;libb10-acld.lib;libb10-asiolinkd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util-io.lib;libb10-log.lib;libb10-dns++.lib;libb10-cc.lib;libb10-cfgclient.lib;libb10-acl.lib;libb10-asiolink.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\lib\server_common
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\server_common
 ..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe server_common_messages.mes
 </Command>
     </PreBuildEvent>
@@ -97,7 +98,8 @@
       <AdditionalDependencies>libb10-exceptions.lib;libb10-util-io.lib;libb10-log.lib;libb10-dns++.lib;libb10-cc.lib;libb10-cfgclient.lib;libb10-acl.lib;libb10-asiolink.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\lib\server_common
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\server_common
 ..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe server_common_messages.mes
 </Command>
     </PreBuildEvent>
diff --git a/win32build/VS2010/libb10-statistics/libb10-statistics.vcxproj b/win32build/VS2010/libb10-statistics/libb10-statistics.vcxproj
index b5f305a..5eb0ac8 100755
--- a/win32build/VS2010/libb10-statistics/libb10-statistics.vcxproj
+++ b/win32build/VS2010/libb10-statistics/libb10-statistics.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,7 +48,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -63,7 +63,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/libb10-testutils/libb10-testutils.vcxproj b/win32build/VS2010/libb10-testutils/libb10-testutils.vcxproj
index 7cbbefc..2b0d666 100755
--- a/win32build/VS2010/libb10-testutils/libb10-testutils.vcxproj
+++ b/win32build/VS2010/libb10-testutils/libb10-testutils.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">
@@ -11,7 +11,6 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h" />
     <ClInclude Include="..\..\..\src\lib\testutils\dll.h" />
     <ClInclude Include="..\..\..\src\lib\testutils\dnsmessage_test.h" />
     <ClInclude Include="..\..\..\src\lib\testutils\mockups.h" />
@@ -20,7 +19,6 @@
     <ClInclude Include="..\..\..\src\lib\testutils\srv_test.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc" />
     <ClCompile Include="..\..\..\src\lib\testutils\dnsmessage_test.cc" />
     <ClCompile Include="..\..\..\src\lib\testutils\socket_request.cc" />
     <ClCompile Include="..\..\..\src\lib\testutils\srv_test.cc" />
@@ -54,7 +52,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -69,7 +67,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-dns++d.lib;libb10-ccd.lib;libb10-xfrd.lib;libb10-asiolinkd.lib;libb10-asiodnsd.lib;libb10-server-commond.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-dns++.lib;libunittest_util.lib;libb10-cc.lib;libb10-xfr.lib;libb10-asiolink.lib;libb10-asiodns.lib;libb10-server-common.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
       <Command>cd ..\..\..\src\lib\testutils\testdata
@@ -105,7 +103,7 @@ python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o simpleresponse_fromWi
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-dns++.lib;libb10-cc.lib;libb10-xfr.lib;libb10-asiolink.lib;libb10-asiodns.lib;libb10-server-common.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-dns++.lib;libunittest_util.lib;libb10-cc.lib;libb10-xfr.lib;libb10-asiolink.lib;libb10-asiodns.lib;libb10-server-common.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
       <Command>cd ..\..\..\src\lib\testutils\testdata
@@ -127,4 +125,4 @@ python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o simpleresponse_fromWi
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libb10-testutils/libb10-testutils.vcxproj.filters b/win32build/VS2010/libb10-testutils/libb10-testutils.vcxproj.filters
index 03d6f9c..9b8e6fd 100755
--- a/win32build/VS2010/libb10-testutils/libb10-testutils.vcxproj.filters
+++ b/win32build/VS2010/libb10-testutils/libb10-testutils.vcxproj.filters
@@ -30,9 +30,6 @@
     <ClInclude Include="..\..\..\src\lib\testutils\socket_request.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\lib\testutils\dll.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -44,9 +41,6 @@
     <ClCompile Include="..\..\..\src\lib\testutils\srv_test.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\dllmain.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/win32build/VS2010/libb10-util-io/libb10-util-io.vcxproj b/win32build/VS2010/libb10-util-io/libb10-util-io.vcxproj
index a2dcd76..e223839 100755
--- a/win32build/VS2010/libb10-util-io/libb10-util-io.vcxproj
+++ b/win32build/VS2010/libb10-util-io/libb10-util-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,7 +52,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -67,7 +67,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/libb10-util/libb10-util.vcxproj b/win32build/VS2010/libb10-util/libb10-util.vcxproj
index f46ac94..322dbec 100755
--- a/win32build/VS2010/libb10-util/libb10-util.vcxproj
+++ b/win32build/VS2010/libb10-util/libb10-util.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,7 +75,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -90,7 +90,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
       <Command>cd ..\..\..\src\lib\util\python
@@ -138,4 +138,4 @@ exit 0
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libb10-xfr/libb10-xfr.vcxproj b/win32build/VS2010/libb10-xfr/libb10-xfr.vcxproj
index 6c7e3fe..0849813 100755
--- a/win32build/VS2010/libb10-xfr/libb10-xfr.vcxproj
+++ b/win32build/VS2010/libb10-xfr/libb10-xfr.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,7 +46,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -61,7 +61,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);%BOOST%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-util-iod.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util-io.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/libfake_session/libfake_session.vcxproj b/win32build/VS2010/libfake_session/libfake_session.vcxproj
index d3676a1..db976ca 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,7 +45,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -60,7 +60,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-ccd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-cc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/liblog_compiler/liblog_compiler.vcxproj b/win32build/VS2010/liblog_compiler/liblog_compiler.vcxproj
index 084b8fa..74243f0 100755
--- a/win32build/VS2010/liblog_compiler/liblog_compiler.vcxproj
+++ b/win32build/VS2010/liblog_compiler/liblog_compiler.vcxproj
@@ -60,7 +60,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)message$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-logd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
diff --git a/win32build/VS2010/libunittest_util/libunittest_util.vcxproj b/win32build/VS2010/libunittest_util/libunittest_util.vcxproj
new file mode 100755
index 0000000..65c7310
--- /dev/null
+++ b/win32build/VS2010/libunittest_util/libunittest_util.vcxproj
@@ -0,0 +1,94 @@
+ï»¿<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{357140E6-91CE-404C-BC96-D8AE23512B67}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>libunittest_util</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;GTEST_LINKED_AS_SHARED_LIBRARY=1;_DEBUG;_WINDOWS;_USRDLL;LIBUNITTEST_UTIL_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <CompileAs>CompileAsCpp</CompileAs>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libb10-dns++.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;GTEST_LINKED_AS_SHARED_LIBRARY=1;NDEBUG;_WINDOWS;_USRDLL;LIBUNITTEST_UTIL_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <CompileAs>CompileAsCpp</CompileAs>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libb10-dns++.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\lib\dns\tests\dll.h" />
+    <ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc" />
+    <ClCompile Include="..\..\dllmain.cc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libunittest_util/libunittest_util.vcxproj.filters b/win32build/VS2010/libunittest_util/libunittest_util.vcxproj.filters
new file mode 100755
index 0000000..bc10bf6
--- /dev/null
+++ b/win32build/VS2010/libunittest_util/libunittest_util.vcxproj.filters
@@ -0,0 +1,33 @@
+ï»¿<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\lib\dns\tests\dll.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dllmain.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libunittest_util/libunittest_util.vcxproj.user b/win32build/VS2010/libunittest_util/libunittest_util.vcxproj.user
new file mode 100755
index 0000000..695b5c7
--- /dev/null
+++ b/win32build/VS2010/libunittest_util/libunittest_util.vcxproj.user
@@ -0,0 +1,3 @@
+ï»¿<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libutil_io_python/libutil_io_python.vcxproj b/win32build/VS2010/libutil_io_python/libutil_io_python.vcxproj
index 55019bf..d9d44bd 100755
--- a/win32build/VS2010/libutil_io_python/libutil_io_python.vcxproj
+++ b/win32build/VS2010/libutil_io_python/libutil_io_python.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">
@@ -60,7 +60,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)libutil_io_python.pyd</OutputFile>
-      <AdditionalDependencies>libb10-util-iod.lib;python32_d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-util-io.lib;python32_d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);C:\Python32\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
diff --git a/win32build/VS2010/libutil_unittests/libutil_unittests.vcxproj b/win32build/VS2010/libutil_unittests/libutil_unittests.vcxproj
index f532037..88ec770 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,7 +55,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -70,7 +70,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-util-iod.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-util-io.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/log-example/log-example.vcxproj b/win32build/VS2010/log-example/log-example.vcxproj
index ad832d3..c17798b 100755
--- a/win32build/VS2010/log-example/log-example.vcxproj
+++ b/win32build/VS2010/log-example/log-example.vcxproj
@@ -61,7 +61,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)logger_example$(TargetExt)</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-logd.lib;log4cplusD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;log4cplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>cd ..\..\..\src\lib\log\tests
diff --git a/win32build/VS2010/log-i1utests/log-i1utests.vcxproj b/win32build/VS2010/log-i1utests/log-i1utests.vcxproj
index e546f10..7576cbc 100755
--- a/win32build/VS2010/log-i1utests/log-i1utests.vcxproj
+++ b/win32build/VS2010/log-i1utests/log-i1utests.vcxproj
@@ -62,7 +62,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)initializer_unittests_1$(TargetExt)</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;libb10-logd.lib;log4cplusD.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-log.lib;log4cplus.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/log-i2utests/log-i2utests.vcxproj b/win32build/VS2010/log-i2utests/log-i2utests.vcxproj
index c8c1d78..e8e6fab 100755
--- a/win32build/VS2010/log-i2utests/log-i2utests.vcxproj
+++ b/win32build/VS2010/log-i2utests/log-i2utests.vcxproj
@@ -62,7 +62,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)initializer_unittests_2$(TargetExt)</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;libb10-logd.lib;log4cplusD.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-log.lib;log4cplus.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/log-iltest/log-iltest.vcxproj b/win32build/VS2010/log-iltest/log-iltest.vcxproj
index a6fbdb0..19f3945 100755
--- a/win32build/VS2010/log-iltest/log-iltest.vcxproj
+++ b/win32build/VS2010/log-iltest/log-iltest.vcxproj
@@ -61,7 +61,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)init_logger_test$(TargetExt)</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-logd.lib;log4cplusD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;log4cplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>cd ..\..\..\src\lib\log\tests
diff --git a/win32build/VS2010/log-lltest/log-lltest.vcxproj b/win32build/VS2010/log-lltest/log-lltest.vcxproj
index a97d1a4..e6dc0f3 100755
--- a/win32build/VS2010/log-lltest/log-lltest.vcxproj
+++ b/win32build/VS2010/log-lltest/log-lltest.vcxproj
@@ -62,7 +62,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)logger_lock_test$(TargetExt)</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-logd.lib;log4cplusD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;log4cplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>cd ..\..\..\src\lib\log\tests
diff --git a/win32build/VS2010/log-tests/log-tests.vcxproj b/win32build/VS2010/log-tests/log-tests.vcxproj
index 707daef..97870eb 100755
--- a/win32build/VS2010/log-tests/log-tests.vcxproj
+++ b/win32build/VS2010/log-tests/log-tests.vcxproj
@@ -82,11 +82,12 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;libb10-logd.lib;log4cplusD.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-log.lib;log4cplus.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\lib\log\tests
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\log\tests
 copy tempdir.h.win32 tempdir.h
 ..\..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe log_test_messages.mes
 </Command>
@@ -113,10 +114,10 @@ copy tempdir.h.win32 tempdir.h
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\..\src\lib\log\tests
+      <Command>set PATH=%PATH%;%BIND10HOME%/../log4cplus/v100/$(Configuration);%BIND10HOME%/win32build/VS2010/$(Configuration)
+cd ..\..\..\src\lib\log\tests
 copy tempdir.h.win32 tempdir.h
 ..\..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe log_test_messages.mes
-
 </Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
diff --git a/win32build/VS2010/log/log.vcxproj b/win32build/VS2010/log/log.vcxproj
index 19e6e83..8a29d0d 100755
--- a/win32build/VS2010/log/log.vcxproj
+++ b/win32build/VS2010/log/log.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">
@@ -61,8 +61,13 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)log_d.pyd</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);C:\Python32\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-logd.lib;libb10-ccd.lib;libb10-cfgclientd.lib;log4cplusD.lib;python32_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;libb10-cc.lib;libb10-cfgclient.lib;log4cplus.lib;python32_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <PostBuildEvent>
+      <Command>cd ..\..\..\src\lib\python\isc\log\tests
+copy log_console.py.win32 log_console.py
+</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -84,6 +89,11 @@
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);C:\Python32\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;libb10-cc.lib;libb10-cfgclient.lib;log4cplus.lib;python32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <PostBuildEvent>
+      <Command>cd ..\..\..\src\lib\python\isc\log\tests
+copy log_console.py.win32 log_console.py
+</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\lib\python\isc\log\log.cc" />
diff --git a/win32build/VS2010/memory_ds/memory_ds.vcxproj b/win32build/VS2010/memory_ds/memory_ds.vcxproj
index 455645c..95505e7 100644
--- a/win32build/VS2010/memory_ds/memory_ds.vcxproj
+++ b/win32build/VS2010/memory_ds/memory_ds.vcxproj
@@ -39,7 +39,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <TargetName>memory_dsD</TargetName>
+    <TargetName>memory_ds</TargetName>
     <TargetExt>.so</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -60,7 +60,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-logd.lib;libb10-dns++d.lib;libb10-ccd.lib;libb10-datasrcd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-log.lib;libb10-dns++.lib;libb10-cc.lib;libb10-datasrc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/nsas-tests/nsas-tests.vcxproj b/win32build/VS2010/nsas-tests/nsas-tests.vcxproj
index 1ba32f9..59d1d76 100755
--- a/win32build/VS2010/nsas-tests/nsas-tests.vcxproj
+++ b/win32build/VS2010/nsas-tests/nsas-tests.vcxproj
@@ -60,7 +60,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;libb10-logd.lib;libb10-cryptolinkd.lib;libb10-dns++d.lib;libb10-asiolinkd.lib;libb10-nsasd.lib;botand.lib;log4cplusD.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-log.lib;libb10-cryptolink.lib;libb10-dns++.lib;libb10-asiolink.lib;libb10-nsas.lib;botan.lib;log4cplus.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%BOOST%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
diff --git a/win32build/VS2010/pyddnspp/pyddnspp.vcxproj b/win32build/VS2010/pyddnspp/pyddnspp.vcxproj
index 52e460b..058758c 100755
--- a/win32build/VS2010/pyddnspp/pyddnspp.vcxproj
+++ b/win32build/VS2010/pyddnspp/pyddnspp.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">
@@ -60,7 +60,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)pydnspp_d.pyd</OutputFile>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-cryptolinkd.lib;libb10-dns++d.lib;libb10-pydnsppd.lib;botand.lib;python32_d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-cryptolink.lib;libb10-dns++.lib;libb10-pydnspp.lib;botan.lib;python32_d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);C:\Python32\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>
diff --git a/win32build/VS2010/pyunittests_util/pyunittests_util.vcxproj b/win32build/VS2010/pyunittests_util/pyunittests_util.vcxproj
index 6904f98..83f520a 100755
--- a/win32build/VS2010/pyunittests_util/pyunittests_util.vcxproj
+++ b/win32build/VS2010/pyunittests_util/pyunittests_util.vcxproj
@@ -64,7 +64,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)pyunittests_util.pyd</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);C:\Python32\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-utild.lib;python32_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-util.lib;python32_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/resolve-tests/resolve-tests.vcxproj b/win32build/VS2010/resolve-tests/resolve-tests.vcxproj
index 66cabb4..59d88ff 100755
--- a/win32build/VS2010/resolve-tests/resolve-tests.vcxproj
+++ b/win32build/VS2010/resolve-tests/resolve-tests.vcxproj
@@ -60,7 +60,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;libb10-cryptolinkd.lib;libb10-dns++d.lib;libb10-logd.lib;libb10-asiolinkd.lib;libb10-asiodnsd.lib;libb10-nsasd.lib;libb10-cached.lib;libb10-resolved.lib;botand.lib;log4cplusD.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-cryptolink.lib;libb10-dns++.lib;libunittest_util.lib;libb10-log.lib;libb10-asiolink.lib;libb10-asiodns.lib;libb10-nsas.lib;libb10-cache.lib;libb10-resolve.lib;botan.lib;log4cplus.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%BOOST%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -81,16 +81,14 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-cryptolink.lib;libb10-dns++.lib;libb10-log.lib;libb10-asiolink.lib;libb10-asiodns.lib;libb10-nsas.lib;libb10-cache.lib;libb10-resolve.lib;botan.lib;log4cplus.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-cryptolink.lib;libb10-dns++.lib;libunittest_util.lib;libb10-log.lib;libb10-asiolink.lib;libb10-asiodns.lib;libb10-nsas.lib;libb10-cache.lib;libb10-resolve.lib;botan.lib;log4cplus.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%BOOST%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h" />
     <ClInclude Include="..\..\..\src\lib\util\unittests\resolver.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc" />
     <ClCompile Include="..\..\..\src\lib\resolve\tests\recursive_query_unittest.cc" />
     <ClCompile Include="..\..\..\src\lib\resolve\tests\recursive_query_unittest_2.cc" />
     <ClCompile Include="..\..\..\src\lib\resolve\tests\recursive_query_unittest_3.cc" />
diff --git a/win32build/VS2010/resolve-tests/resolve-tests.vcxproj.filters b/win32build/VS2010/resolve-tests/resolve-tests.vcxproj.filters
index 1a2aa4e..3883c4e 100755
--- a/win32build/VS2010/resolve-tests/resolve-tests.vcxproj.filters
+++ b/win32build/VS2010/resolve-tests/resolve-tests.vcxproj.filters
@@ -15,17 +15,11 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\lib\util\unittests\resolver.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\lib\resolve\tests\recursive_query_unittest.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/win32build/VS2010/resolver-tests/resolver-tests.vcxproj b/win32build/VS2010/resolver-tests/resolver-tests.vcxproj
index 9c8fbdd..92c332b 100755
--- a/win32build/VS2010/resolver-tests/resolver-tests.vcxproj
+++ b/win32build/VS2010/resolver-tests/resolver-tests.vcxproj
@@ -52,7 +52,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;GTEST_CREATE_SHARED_LIBRARY=1;TEST_DATA_DIR="%BIND10HOME%/src/lib/testutils/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/testutils/testdata";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;GTEST_CREATE_SHARED_LIBRARY=1;TEST_DATA_DIR="%BIND10HOME%/src/lib/testutils/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/testutils/testdata";_DEBUG;_CONSOLE;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\bin;..\..\..\ext\asio;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
@@ -61,7 +61,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)run_unittests.exe</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%BOOST%/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-util-iod.lib;libutil_unittestsd.lib;libb10-logd.lib;libb10-cryptolinkd.lib;libb10-dns++d.lib;libb10-ccd.lib;libb10-cfgclientd.lib;libb10-acld.lib;libb10-dnsacld.lib;libb10-asiolinkd.lib;libb10-asiodnsd.lib;libb10-nsasd.lib;libb10-cached.lib;libb10-resolved.lib;libb10-testutilsd.lib;libb10-server-commond.lib;botand.lib;log4cplusD.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-util-io.lib;libutil_unittests.lib;libb10-log.lib;libb10-cryptolink.lib;libb10-dns++.lib;libunittest_util.lib;libb10-cc.lib;libb10-cfgclient.lib;libb10-acl.lib;libb10-dnsacl.lib;libb10-asiolink.lib;libb10-asiodns.lib;libb10-nsas.lib;libb10-cache.lib;libb10-resolve.lib;libb10-testutils.lib;libb10-server-common.lib;botan.lib;log4cplus.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -71,7 +71,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;GTEST_CREATE_SHARED_LIBRARY=1;TEST_DATA_DIR="%BIND10HOME%/src/lib/testutils/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/testutils/testdata";NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;GTEST_CREATE_SHARED_LIBRARY=1;TEST_DATA_DIR="%BIND10HOME%/src/lib/testutils/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/testutils/testdata";NDEBUG;_CONSOLE;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\bin;..\..\..\ext\asio;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
@@ -82,7 +82,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <OutputFile>$(OutDir)run_unittests.exe</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\botan\v100\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%BOOST%/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-util-io.lib;libutil_unittests.lib;libb10-log.lib;libb10-cryptolink.lib;libb10-dns++.lib;libb10-cc.lib;libb10-cfgclient.lib;libb10-acl.lib;libb10-dnsacl.lib;libb10-asiolink.lib;libb10-asiodns.lib;libb10-nsas.lib;libb10-cache.lib;libb10-resolve.lib;libb10-testutils.lib;libb10-server-common.lib;botan.lib;log4cplus.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-util-io.lib;libutil_unittests.lib;libb10-log.lib;libb10-cryptolink.lib;libb10-dns++.lib;libunittest_util.lib;libb10-cc.lib;libb10-cfgclient.lib;libb10-acl.lib;libb10-dnsacl.lib;libb10-asiolink.lib;libb10-asiodns.lib;libb10-nsas.lib;libb10-cache.lib;libb10-resolve.lib;libb10-testutils.lib;libb10-server-common.lib;botan.lib;log4cplus.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -94,14 +94,12 @@
     <ClCompile Include="..\..\..\src\bin\resolver\tests\resolver_unittest.cc" />
     <ClCompile Include="..\..\..\src\bin\resolver\tests\response_scrubber_unittest.cc" />
     <ClCompile Include="..\..\..\src\bin\resolver\tests\run_unittests.cc" />
-    <ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\bin\resolver\resolver.h" />
     <ClInclude Include="..\..\..\src\bin\resolver\resolver_log.h" />
     <ClInclude Include="..\..\..\src\bin\resolver\resolver_messages.h" />
     <ClInclude Include="..\..\..\src\bin\resolver\response_scrubber.h" />
-    <ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/win32build/VS2010/resolver-tests/resolver-tests.vcxproj.filters b/win32build/VS2010/resolver-tests/resolver-tests.vcxproj.filters
index 157f58a..22dc9bf 100755
--- a/win32build/VS2010/resolver-tests/resolver-tests.vcxproj.filters
+++ b/win32build/VS2010/resolver-tests/resolver-tests.vcxproj.filters
@@ -39,9 +39,6 @@
     <ClCompile Include="..\..\..\src\bin\resolver\response_scrubber.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\bin\resolver\resolver.h">
@@ -56,8 +53,5 @@
     <ClInclude Include="..\..\..\src\bin\resolver\response_scrubber.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/win32build/VS2010/server-common-tests/server-common-tests.vcxproj b/win32build/VS2010/server-common-tests/server-common-tests.vcxproj
index 3c4bf88..acf48f4 100755
--- a/win32build/VS2010/server-common-tests/server-common-tests.vcxproj
+++ b/win32build/VS2010/server-common-tests/server-common-tests.vcxproj
@@ -60,7 +60,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-util-iod.lib;libutil_unittestsd.lib;libb10-logd.lib;libb10-cryptolinkd.lib;libb10-dns++d.lib;libb10-ccd.lib;libb10-cfgclientd.lib;libfake_sessiond.lib;libb10-asiolinkd.lib;libb10-asiodnsd.lib;libb10-acld.lib;libb10-server-commond.lib;log4cplusD.lib;botand.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-util-io.lib;libutil_unittests.lib;libb10-log.lib;libb10-cryptolink.lib;libb10-dns++.lib;libb10-cc.lib;libb10-cfgclient.lib;libfake_session.lib;libb10-asiolink.lib;libb10-asiodns.lib;libb10-acl.lib;libb10-server-common.lib;log4cplus.lib;botan.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\botan\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%BOOST%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>
diff --git a/win32build/VS2010/sqlite3_ds/sqlite3_ds.vcxproj b/win32build/VS2010/sqlite3_ds/sqlite3_ds.vcxproj
index 792570b..9e13b6c 100644
--- a/win32build/VS2010/sqlite3_ds/sqlite3_ds.vcxproj
+++ b/win32build/VS2010/sqlite3_ds/sqlite3_ds.vcxproj
@@ -39,7 +39,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <TargetName>sqlite3_dsD</TargetName>
+    <TargetName>sqlite3_ds</TargetName>
     <TargetExt>.so</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -60,7 +60,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);C:\sqlite3;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-logd.lib;libb10-dns++d.lib;libb10-ccd.lib;libb10-datasrcd.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-log.lib;libb10-dns++.lib;libb10-cc.lib;libb10-datasrc.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/static_ds/static_ds.vcxproj b/win32build/VS2010/static_ds/static_ds.vcxproj
index 2e49534..85d93fc 100644
--- a/win32build/VS2010/static_ds/static_ds.vcxproj
+++ b/win32build/VS2010/static_ds/static_ds.vcxproj
@@ -39,7 +39,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <TargetName>static_dsD</TargetName>
+    <TargetName>static_ds</TargetName>
     <TargetExt>.so</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -60,7 +60,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-logd.lib;libb10-dns++d.lib;libb10-ccd.lib;libb10-datasrcd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-log.lib;libb10-dns++.lib;libb10-cc.lib;libb10-datasrc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/statistics-tests/statistics-tests.vcxproj b/win32build/VS2010/statistics-tests/statistics-tests.vcxproj
index b9ff750..526f2fe 100755
--- a/win32build/VS2010/statistics-tests/statistics-tests.vcxproj
+++ b/win32build/VS2010/statistics-tests/statistics-tests.vcxproj
@@ -61,7 +61,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\log4cplus\v100\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libutil_unittestsd.lib;libb10-logd.lib;libb10-statisticsd.lib;log4cplusD.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libutil_unittests.lib;libb10-log.lib;libb10-statistics.lib;log4cplus.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/win32build/VS2010/util-tests/util-tests.vcxproj b/win32build/VS2010/util-tests/util-tests.vcxproj
index be5df0c..a762868 100755
--- a/win32build/VS2010/util-tests/util-tests.vcxproj
+++ b/win32build/VS2010/util-tests/util-tests.vcxproj
@@ -60,7 +60,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libb10-exceptionsd.lib;libb10-utild.lib;libb10-util-iod.lib;libutil_unittestsd.lib;gtestd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libb10-exceptions.lib;libb10-util.lib;libb10-util-io.lib;libutil_unittests.lib;gtest.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
diff --git a/win32build/check/all b/win32build/check/all
index c7ae1ea..4b9dedc 100755
--- a/win32build/check/all
+++ b/win32build/check/all
@@ -14,5 +14,8 @@ ${BIND10HOME}/win32build/check/cache-all && \
 ${BIND10HOME}/win32build/check/resolve-all && \
 ${BIND10HOME}/win32build/check/datasrc-all && \
 ${BIND10HOME}/win32build/check/server-common-all && \
+${BIND10HOME}/win32build/check/python-all && \
 ${BIND10HOME}/win32build/check/dhcp++-all && \
-${BIND10HOME}/win32build/check/statistics-all
+${BIND10HOME}/win32build/check/statistics-all && \
+${BIND10HOME}/win32build/check/resolver-all && \
+${BIND10HOME}/win32build/check/dhcp6-all
\ No newline at end of file
diff --git a/win32build/check/debug-all b/win32build/check/debug-all
index 5b09014..16edffd 100755
--- a/win32build/check/debug-all
+++ b/win32build/check/debug-all
@@ -14,5 +14,8 @@ ${BIND10HOME}/win32build/check/cache-debug && \
 ${BIND10HOME}/win32build/check/resolve-debug && \
 ${BIND10HOME}/win32build/check/datasrc-debug && \
 ${BIND10HOME}/win32build/check/server-common-debug && \
+${BIND10HOME}/win32build/check/python-debug && \
 ${BIND10HOME}/win32build/check/dhcp++-debug && \
-${BIND10HOME}/win32build/check/statistics-debug
+${BIND10HOME}/win32build/check/statistics-debug && \
+${BIND10HOME}/win32build/check/resolver-debug && \
+${BIND10HOME}/win32build/check/dhcp6-debug
\ No newline at end of file
diff --git a/win32build/check/dhcp6-all b/win32build/check/dhcp6-all
new file mode 100755
index 0000000..e6afb81
--- /dev/null
+++ b/win32build/check/dhcp6-all
@@ -0,0 +1,2 @@
+${BIND10HOME}/win32build/check/dhcp6-release && \
+${BIND10HOME}/win32build/check/dhcp6-debug
diff --git a/win32build/check/dhcp6-debug b/win32build/check/dhcp6-debug
new file mode 100755
index 0000000..cbf0d47
--- /dev/null
+++ b/win32build/check/dhcp6-debug
@@ -0,0 +1,27 @@
+. ${BIND10HOME}/win32build/check/site-debug
+echo
+echo skipping dhcp6-tests / Debug
+echo
+exit 0
+${BIND10HOME}/win32build/${VSVER}/dhcp6-tests/Debug/dhcp6_unittests.exe
+if test $? -ne 0; then
+    exit $?
+fi
+if [ ${PYTHON} == "None" ]; then
+    echo skipping dhcp6 python / Debug
+    exit 0
+fi
+echo skipping dhcp6 python / Debug
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python/isc/log_messages"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/bin"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/bin/bind10"
+PYTESTS='dhcp6_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/bin/dhcp6/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
diff --git a/win32build/check/dhcp6-release b/win32build/check/dhcp6-release
new file mode 100755
index 0000000..48b44b3
--- /dev/null
+++ b/win32build/check/dhcp6-release
@@ -0,0 +1,27 @@
+. ${BIND10HOME}/win32build/check/site-release
+echo
+echo skipping dhcp6-tests / Release
+echo
+exit 0
+${BIND10HOME}/win32build/${VSVER}/dhcp6-tests/Release/dhcp6_unittests.exe
+if test $? -ne 0; then
+    exit $?
+fi
+if [ ${PYTHON} == "None" ]; then
+    echo skipping dhcp6 python / Release
+    exit 0
+fi
+echo skipping dhcp6 python / Release
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python/isc/log_messages"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/bin"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/bin/bind10"
+PYTESTS='dhcp6_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/bin/dhcp6/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
diff --git a/win32build/check/python-all b/win32build/check/python-all
new file mode 100755
index 0000000..8de205f
--- /dev/null
+++ b/win32build/check/python-all
@@ -0,0 +1,2 @@
+${BIND10HOME}/win32build/check/python-release && \
+${BIND10HOME}/win32build/check/python-debug
diff --git a/win32build/check/python-debug b/win32build/check/python-debug
new file mode 100755
index 0000000..90f8c41
--- /dev/null
+++ b/win32build/check/python-debug
@@ -0,0 +1,211 @@
+. ${BIND10HOME}/win32build/check/site-debug
+echo
+echo partial python / Debug
+echo
+if [ ${PYTHON} == "None" ]; then
+    echo skipping python / Debug
+    exit 0
+fi
+CPYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python/isc/log_messages"
+CPYTHONPATH="${CPYTHONPATH};${BIND10HOME}/src/lib/python"
+CTESTDATA=${BIND10HOME}/src/lib/python/isc/datasrc/tests/testdata
+
+echo partial python datasrc / Debug
+export PYTHONPATH="${CPYTHONPATH};${BIND10HOME}/src/lib/python/isc/log"
+export TESTDATA_PATH=${CTESTDATA}
+export TESTDATA_WRITE_PATH=${BIND10HOME}/src/lib/python/isc/datasrc/tests
+export GLOBAL_TESTDATA_PATH=${BIND10HOME}/src/lib/testutils/testdata
+#PYTESTS='datasrc_test.py sqlite3_ds_test.py'
+PYTESTS='sqlite3_ds_test.py'
+for pytest in ${PYTESTS}
+    do
+        echo ${pytest}
+        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/datasrc/tests/${pytest}
+        if test $? -ne 0; then
+            exit $?
+        fi
+    done
+
+echo skipping python cc / Debug
+export PYTHONPATH=${CPYTHONPATH}
+#export BIND10_TEST_SOCKET_FILE=
+PYTESTS='message_test.py data_test.py session_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/cc/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo skipping python config / Debug
+export PYTHONPATH="${CPYTHONPATH};${BIND10HOME}/src/lib/python/isc/config"
+export B10_LOCKFILE_DIR_FROM_BUILD=${BIND10HOME}
+export B10_TEST_PLUGIN_DIR=${BIND10HOME}/src/bin/cfgmgr/plugins
+export CONFIG_TESTDATA_PATH=${CTESTDATA}
+export CONFIG_WR_TESTDATA_PATH=${CTESTDATA}
+PYTESTS='ccsession_test.py
+    cfgmgr_test.py
+    config_data_test.py
+    module_spec_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/config/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo python log / Debug
+export PYTHONPATH="${CPYTHONPATH};${BIND10HOME}/src/lib/python/isc/log"
+export B10_LOCKFILE_DIR_FROM_BUILD=${BIND10HOME}
+export B10_TEST_PLUGIN_DIR=${BIND10HOME}/src/bin/cfgmgr/plugins
+export CONFIG_TESTDATA_PATH=${CTESTDATA}
+export CONFIG_WR_TESTDATA_PATH=${CTESTDATA}
+BDIR=${BIND10HOME}/src/lib/python/isc/log/tests
+${BDIR}/check_output-win32.sh ${BDIR}/log_console.py ${BDIR}/console.out
+if test $? -ne 0; then
+    exit $?
+fi
+PYTESTS='log_test.py log_console.py'
+for pytest in ${PYTESTS}
+    do
+        echo ${pytest}
+        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/log/tests/${pytest}
+        if test $? -ne 0; then
+            exit $?
+        fi
+    done
+
+echo skipping python net / Debug
+export PYTHONPATH=${CPYTHONPATH}
+PYTESTS='addr_test.py parse_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/net/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo skipping python notify / Debug
+export PYTHONPATH=${CPYTHONPATH}
+export TESTDATASRCDIR=${BIND10HOME}/src/lib/python/isc/notify/tests/testdata/
+PYTESTS='notify_out_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/notify/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo skipping python util cio / Debug
+export PYTHONPATH=${CPYTHONPATH}
+export TESTDATAOBJDIR=${BIND10HOME}/src/lib/python/isc/util/cio/tests
+PYTESTS='socketsession_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/util/cio/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo skipping python util / Debug
+export PYTHONPATH=${CPYTHONPATH}
+PYTESTS='process_test.py socketserver_mixin_test.py file_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/util/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo python acl / Debug
+export PYTHONPATH=${CPYTHONPATH}
+PYTESTS='acl_test.py dns_test.py'
+for pytest in ${PYTESTS}
+    do
+        echo ${pytest}
+        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/acl/tests/${pytest}
+        if test $? -ne 0; then
+            exit $?
+        fi
+    done
+
+echo skipping python bind10 / Debug
+export PYTHONPATH="${CPYTHONPATH};${BIND10HOME}/src/bin"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/bin/bind10"
+export B10_LOCKFILE_DIR_FROM_BUILD=${BIND10HOME}
+#BIND10_MSGQ_SOCKET_FILE=
+PYTESTS='sockcreator_test.py component_test.py socket_cache_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/bind10/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo skipping python xfrin / Debug
+export PYTHONPATH=${CPYTHONPATH}
+export B10_LOCKFILE_DIR_FROM_BUILD=${BIND10HOME}
+PYTESTS='diff_tests.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/xfrin/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo skipping python server-common / Debug
+export PYTHONPATH=${CPYTHONPATH}
+export B10_LOCKFILE_DIR_FROM_BUILD=${BIND10HOME}
+PYTESTS='tsig_keyring_test.py dns_tcp_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} \
+#            ${BIND10HOME}/src/lib/python/isc/server_common/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo skipping python ddns / Debug
+export PYTHONPATH=${CPYTHONPATH}
+export TESTDATA_PATH=${CTESTDATA}
+export TESTDATA_WRITE_PATH=${BIND10HOME}/src/lib/python/isc/ddns/tests
+PYTESTS='session_tests.py zone_config_tests.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/ddns/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo skipping python sysinfo / Debug
+export PYTHONPATH=${CPYTHONPATH}
+PYTESTS='sysinfo_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/sysinfo/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
diff --git a/win32build/check/python-release b/win32build/check/python-release
new file mode 100755
index 0000000..601c4e2
--- /dev/null
+++ b/win32build/check/python-release
@@ -0,0 +1,211 @@
+. ${BIND10HOME}/win32build/check/site-release
+echo
+echo partial python / Release
+echo
+if [ ${PYTHON} == "None" ]; then
+    echo skipping python / Release
+    exit 0
+fi
+CPYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python/isc/log_messages"
+CPYTHONPATH="${CPYTHONPATH};${BIND10HOME}/src/lib/python"
+CTESTDATA=${BIND10HOME}/src/lib/python/isc/datasrc/tests/testdata
+
+echo partial python datasrc / Release
+export PYTHONPATH="${CPYTHONPATH};${BIND10HOME}/src/lib/python/isc/log"
+export TESTDATA_PATH=${CTESTDATA}
+export TESTDATA_WRITE_PATH=${BIND10HOME}/src/lib/python/isc/datasrc/tests
+export GLOBAL_TESTDATA_PATH=${BIND10HOME}/src/lib/testutils/testdata
+#PYTESTS='datasrc_test.py sqlite3_ds_test.py'
+PYTESTS='sqlite3_ds_test.py'
+for pytest in ${PYTESTS}
+    do
+        echo ${pytest}
+        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/datasrc/tests/${pytest}
+        if test $? -ne 0; then
+            exit $?
+        fi
+    done
+
+echo skipping python cc / Release
+export PYTHONPATH=${CPYTHONPATH}
+#export BIND10_TEST_SOCKET_FILE=
+PYTESTS='message_test.py data_test.py session_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/cc/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo skipping python config / Release
+export PYTHONPATH="${CPYTHONPATH};${BIND10HOME}/src/lib/python/isc/config"
+export B10_LOCKFILE_DIR_FROM_BUILD=${BIND10HOME}
+export B10_TEST_PLUGIN_DIR=${BIND10HOME}/src/bin/cfgmgr/plugins
+export CONFIG_TESTDATA_PATH=${CTESTDATA}
+export CONFIG_WR_TESTDATA_PATH=${CTESTDATA}
+PYTESTS='ccsession_test.py
+    cfgmgr_test.py
+    config_data_test.py
+    module_spec_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/config/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo python log / Release
+export PYTHONPATH="${CPYTHONPATH};${BIND10HOME}/src/lib/python/isc/log"
+export B10_LOCKFILE_DIR_FROM_BUILD=${BIND10HOME}
+export B10_TEST_PLUGIN_DIR=${BIND10HOME}/src/bin/cfgmgr/plugins
+export CONFIG_TESTDATA_PATH=${CTESTDATA}
+export CONFIG_WR_TESTDATA_PATH=${CTESTDATA}
+BDIR=${BIND10HOME}/src/lib/python/isc/log/tests
+${BDIR}/check_output-win32.sh ${BDIR}/log_console.py ${BDIR}/console.out
+if test $? -ne 0; then
+    exit $?
+fi
+PYTESTS='log_test.py log_console.py'
+for pytest in ${PYTESTS}
+    do
+        echo ${pytest}
+        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/log/tests/${pytest}
+        if test $? -ne 0; then
+            exit $?
+        fi
+    done
+
+echo skipping python net / Release
+export PYTHONPATH=${CPYTHONPATH}
+PYTESTS='addr_test.py parse_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/net/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo skipping python notify / Release
+export PYTHONPATH=${CPYTHONPATH}
+export TESTDATASRCDIR=${BIND10HOME}/src/lib/python/isc/notify/tests/testdata/
+PYTESTS='notify_out_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/notify/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo skipping python util cio / Release
+export PYTHONPATH=${CPYTHONPATH}
+export TESTDATAOBJDIR=${BIND10HOME}/src/lib/python/isc/util/cio/tests
+PYTESTS='socketsession_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/util/cio/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo skipping python util / Release
+export PYTHONPATH=${CPYTHONPATH}
+PYTESTS='process_test.py socketserver_mixin_test.py file_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/util/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo python acl / Release
+export PYTHONPATH=${CPYTHONPATH}
+PYTESTS='acl_test.py dns_test.py'
+for pytest in ${PYTESTS}
+    do
+        echo ${pytest}
+        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/acl/tests/${pytest}
+        if test $? -ne 0; then
+            exit $?
+        fi
+    done
+
+echo skipping python bind10 / Release
+export PYTHONPATH="${CPYTHONPATH};${BIND10HOME}/src/bin"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/bin/bind10"
+export B10_LOCKFILE_DIR_FROM_BUILD=${BIND10HOME}
+#BIND10_MSGQ_SOCKET_FILE=
+PYTESTS='sockcreator_test.py component_test.py socket_cache_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/bind10/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo skipping python xfrin / Release
+export PYTHONPATH=${CPYTHONPATH}
+export B10_LOCKFILE_DIR_FROM_BUILD=${BIND10HOME}
+PYTESTS='diff_tests.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/xfrin/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo skipping python server-common / Release
+export PYTHONPATH=${CPYTHONPATH}
+export B10_LOCKFILE_DIR_FROM_BUILD=${BIND10HOME}
+PYTESTS='tsig_keyring_test.py dns_tcp_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} \
+#            ${BIND10HOME}/src/lib/python/isc/server_common/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo skipping python ddns / Release
+export PYTHONPATH=${CPYTHONPATH}
+export TESTDATA_PATH=${CTESTDATA}
+export TESTDATA_WRITE_PATH=${BIND10HOME}/src/lib/python/isc/ddns/tests
+PYTESTS='session_tests.py zone_config_tests.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/ddns/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
+echo skipping python sysinfo / Release
+export PYTHONPATH=${CPYTHONPATH}
+PYTESTS='sysinfo_test.py'
+#for pytest in ${PYTESTS}
+#    do
+#        echo ${pytest}
+#        ${PYTHON} ${BIND10HOME}/src/lib/python/isc/sysinfo/tests/${pytest}
+#        if test $? -ne 0; then
+#            exit $?
+#        fi
+#    done
+
diff --git a/win32build/check/release-all b/win32build/check/release-all
index 27529b7..04c63ce 100755
--- a/win32build/check/release-all
+++ b/win32build/check/release-all
@@ -14,5 +14,8 @@ ${BIND10HOME}/win32build/check/cache-release && \
 ${BIND10HOME}/win32build/check/resolve-release && \
 ${BIND10HOME}/win32build/check/datasrc-release && \
 ${BIND10HOME}/win32build/check/server-common-release && \
+${BIND10HOME}/win32build/check/python-release && \
 ${BIND10HOME}/win32build/check/dhcp++-release && \
-${BIND10HOME}/win32build/check/statistics-release
+${BIND10HOME}/win32build/check/statistics-release && \
+${BIND10HOME}/win32build/check/resolver-release && \
+${BIND10HOME}/win32build/check/dhcp6-release
\ No newline at end of file
diff --git a/win32build/check/resolver-all b/win32build/check/resolver-all
new file mode 100755
index 0000000..2ffe07f
--- /dev/null
+++ b/win32build/check/resolver-all
@@ -0,0 +1,2 @@
+${BIND10HOME}/win32build/check/resolver-release && \
+${BIND10HOME}/win32build/check/resolver-debug
diff --git a/win32build/check/resolver-debug b/win32build/check/resolver-debug
new file mode 100755
index 0000000..b0b0e36
--- /dev/null
+++ b/win32build/check/resolver-debug
@@ -0,0 +1,5 @@
+. ${BIND10HOME}/win32build/check/site-debug
+echo
+echo resolver-tests / Debug
+echo
+${BIND10HOME}/win32build/${VSVER}/resolver-tests/Debug/run_unittests.exe
diff --git a/win32build/check/resolver-release b/win32build/check/resolver-release
new file mode 100755
index 0000000..0a59580
--- /dev/null
+++ b/win32build/check/resolver-release
@@ -0,0 +1,5 @@
+. ${BIND10HOME}/win32build/check/site-release
+echo
+echo resolver-tests / Release
+echo
+${BIND10HOME}/win32build/${VSVER}/resolver-tests/Release/run_unittests.exe
diff --git a/win32build/check/site-debug b/win32build/check/site-debug
index 94dd022..cdd181f 100755
--- a/win32build/check/site-debug
+++ b/win32build/check/site-debug
@@ -1,7 +1,9 @@
 export B10_FROM_BUILD=${BIND10HOME}
 export VSVER=VS2010
 export RTVER=v100
-export PATH=${PATH}:${BIND10HOME}/../gtest/${RTVER}/Debug:${BIND10HOME}/../botan/${RTVER}/Debug:${BIND10HOME}/../log4cplus/${RTVER}/Debug:${BIND10HOME}/win32build/${VSVER}/Debug
-export PYTHONPATH=${PYTHONPATH};${BIND10HOME}/win32build/${VSVER}/Debug
-#export PYTHON=c:/Python32/python_d.exe
-export PYTHON=None
+parent=`cd ${BIND10HOME}/..; pwd`
+b10home=`cd ${BIND10HOME}; pwd`
+export PATH=${PATH}:${parent}/gtest/${RTVER}/Debug:${parent}/botan/${RTVER}/Debug:${parent}/log4cplus/${RTVER}/Debug:${b10home}/win32build/${VSVER}/Debug
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/win32build/${VSVER}/Debug"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python/isc/util"
+export PYTHON=c:/Python32/python_d.exe
diff --git a/win32build/check/site-release b/win32build/check/site-release
index 1515738..866f224 100755
--- a/win32build/check/site-release
+++ b/win32build/check/site-release
@@ -1,6 +1,9 @@
 export B10_FROM_BUILD=${BIND10HOME}
 export VSVER=VS2010
 export RTVER=v100
-export PATH=${PATH}:${BIND10HOME}/../gtest/${RTVER}/Release:${BIND10HOME}/../botan/${RTVER}/Release:${BIND10HOME}/../log4cplus/${RTVER}/Release:${BIND10HOME}/win32build/${VSVER}/Release
-export PYTHONPATH=${PYTHONPATH};${BIND10HOME}/win32build/${VSVER}/Release
-export PYTHON=c:/Python32/python.exe
\ No newline at end of file
+parent=`cd ${BIND10HOME}/..; pwd`
+b10home=`cd ${BIND10HOME}; pwd`
+export PATH=${PATH}:${parent}/gtest/${RTVER}/Release:${parent}/botan/${RTVER}/Release:${parent}/log4cplus/${RTVER}/Release:${b10home}/win32build/${VSVER}/Release
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/win32build/${VSVER}/Release"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python/isc/util"
+export PYTHON=c:/Python32/python.exe

