BIND 10 trac826, updated. 15ceb96a849bd3c9c9d8e279cd2a67d4dd28e898 [trac826] port to Visual Studio 2008

BIND 10 source code commits bind10-changes at lists.isc.org
Tue Oct 18 18:03:58 UTC 2011


The branch, trac826 has been updated
       via  15ceb96a849bd3c9c9d8e279cd2a67d4dd28e898 (commit)
      from  823eafb896e27af8428e09c2a8b430a1aae85973 (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 15ceb96a849bd3c9c9d8e279cd2a67d4dd28e898
Author: Francis Dupont <fdupont at isc.org>
Date:   Tue Oct 18 20:03:17 2011 +0200

    [trac826] port to Visual Studio 2008
    
    Now everything can compile, but not tested.

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

Summary of changes:
 WIN32-NOTES                                        |   16 +-
 src/bin/resolver/main.cc                           |    1 +
 src/bin/resolver/resolver.cc                       |    5 +-
 src/bin/resolver/tests/resolver_config_unittest.cc |    1 +
 src/bin/resolver/tests/resolver_unittest.cc        |    1 +
 src/lib/datasrc/tests/database_unittest.cc         |    3 +-
 src/lib/dhcp/tests/libdhcp_unittest.cc             |   18 +-
 win32build/VS2008/b10-dhcp6/b10-dhcp6.vcproj       |  243 +++++++++++++
 .../VS2008/b10-dhcp6_tests/b10-dhcp6_tests.vcproj  |  237 +++++++++++++
 win32build/VS2008/b10-host/b10-host.vcproj         |  209 ++++++++++++
 win32build/VS2008/b10-resolver/b10-resolver.vcproj |  247 ++++++++++++++
 .../b10-resolver_tests/b10-resolver_tests.vcproj   |  253 ++++++++++++++
 win32build/VS2008/bind10.sln                       |  358 ++++++++++++++++++--
 win32build/VS2008/libacl/libacl.vcproj             |  197 +++++++++++
 win32build/VS2008/libacl_tests/libacl_tests.vcproj |  241 +++++++++++++
 win32build/VS2008/libasiodns/libasiodns.vcproj     |   12 +-
 .../libasiodns_tests/libasiodns_tests.vcproj       |   12 +-
 win32build/VS2008/libasiolink/libasiolink.vcproj   |    4 +-
 .../libasiolink_tests/libasiolink_tests.vcproj     |   12 +-
 win32build/VS2008/libbench/libbench.vcproj         |    4 +-
 .../libbench_example/libbench_example.vcproj       |    4 +-
 .../VS2008/libbench_tests/libbench_tests.vcproj    |   16 +-
 win32build/VS2008/libcache/libcache.vcproj         |   22 ++-
 .../VS2008/libcache_tests/libcache_tests.vcproj    |   16 +-
 win32build/VS2008/libcc/libcc.vcproj               |   24 ++-
 win32build/VS2008/libcc_tests/libcc_tests.vcproj   |   12 +-
 win32build/VS2008/libcfgclient/libcfgclient.vcproj |   30 ++-
 .../libcfgclient_tests/libcfgclient_tests.vcproj   |   24 +-
 .../VS2008/libcryptolink/libcryptolink.vcproj      |    4 +-
 .../libcryptolink_tests/libcryptolink_tests.vcproj |   12 +-
 win32build/VS2008/libdatasrc/libdatasrc.vcproj     |   54 +++-
 .../libdatasrc_tests/libdatasrc_tests.vcproj       |   38 ++-
 win32build/VS2008/libdhcp/libdhcp.vcproj           |  221 ++++++++++++
 .../VS2008/libdhcp_tests/libdhcp_tests.vcproj      |  225 ++++++++++++
 win32build/VS2008/libdns++/libdns++.vcproj         |   28 ++-
 .../libdns++_benchmarks/libdns++_benchmarks.vcproj |    8 +-
 .../VS2008/libdns++_python/libdns++_python.vcproj  |  180 ++++++++--
 .../VS2008/libdns++_tests/libdns++_tests.vcproj    |   52 +++-
 win32build/VS2008/libdnsacl/libdnsacl.vcproj       |  181 ++++++++++
 .../libexceptions_tests/libexceptions_tests.vcproj |    4 +-
 .../VS2008/libfake_session/libfake_session.vcproj  |  177 ++++++++++
 win32build/VS2008/liblog/liblog.vcproj             |   92 ++++-
 .../VS2008/liblog_compiler/liblog_compiler.vcproj  |   12 +-
 .../VS2008/liblog_example/liblog_example.vcproj    |  211 ++++++++++++
 .../VS2008/liblog_iltest/liblog_iltest.vcproj      |  203 +++++++++++
 .../VS2008/liblog_rtitest/liblog_rtitest.vcproj    |    4 +-
 win32build/VS2008/liblog_tests/liblog_tests.vcproj |   50 ++-
 win32build/VS2008/libnsas/libnsas.vcproj           |   22 ++-
 .../VS2008/libnsas_tests/libnsas_tests.vcproj      |   12 +-
 win32build/VS2008/libresolve/libresolve.vcproj     |   22 ++-
 .../libresolve_tests/libresolve_tests.vcproj       |   12 +-
 .../libserver_common/libserver_common.vcproj       |   38 ++-
 .../libserver_common_tests.vcproj                  |   30 ++-
 win32build/VS2008/libtestutils/libtestutils.vcproj |    6 +-
 win32build/VS2008/libutil/libutil.vcproj           |    6 +-
 .../libutil_io_python/libutil_io_python.vcproj     |    4 +-
 .../libutil_io_tests/libutil_io_tests.vcproj       |    4 +-
 .../VS2008/libutil_tests/libutil_tests.vcproj      |   16 +-
 .../libutil_unittests/libutil_unittests.vcproj     |   24 ++-
 win32build/VS2008/libxfr/libxfr.vcproj             |    4 +-
 win32build/VS2008/pydacl/pydacl.vcproj             |  205 +++++++++++
 win32build/VS2008/pyddatasrc/pyddatasrc.vcproj     |  253 ++++++++++++++
 win32build/VS2008/pyddns++/pyddns++.vcproj         |  203 +++++++++++
 win32build/VS2008/pyddnsacl/pyddnsacl.vcproj       |  245 +++++++++++++
 win32build/VS2008/pydlog/pydlog.vcproj             |  201 +++++++++++
 win32build/VS2008/pydutil_io/pydutil_io.vcproj     |  201 +++++++++++
 win32build/VS2008/tt-badpacket/tt-badpacket.vcproj |  241 +++++++++++++
 .../tt-badpacket_tests/tt-badpacket_tests.vcproj   |  237 +++++++++++++
 win32build/VS2010/b10-dhcp6/b10-dhcp6.vcxproj      |    1 +
 .../VS2010/b10-dhcp6/b10-dhcp6.vcxproj.filters     |    3 +
 win32build/VS2010/libdns++/libdns++.vcxproj        |    1 -
 .../VS2010/libdns++/libdns++.vcxproj.filters       |    3 -
 win32build/VS2010/libresolve/libresolve.vcxproj    |    3 +-
 .../VS2010/libresolve/libresolve.vcxproj.filters   |    3 +
 74 files changed, 5702 insertions(+), 276 deletions(-)
 create mode 100755 win32build/VS2008/b10-dhcp6/b10-dhcp6.vcproj
 create mode 100755 win32build/VS2008/b10-dhcp6_tests/b10-dhcp6_tests.vcproj
 create mode 100755 win32build/VS2008/b10-host/b10-host.vcproj
 create mode 100755 win32build/VS2008/b10-resolver/b10-resolver.vcproj
 create mode 100755 win32build/VS2008/b10-resolver_tests/b10-resolver_tests.vcproj
 create mode 100755 win32build/VS2008/libacl/libacl.vcproj
 create mode 100755 win32build/VS2008/libacl_tests/libacl_tests.vcproj
 create mode 100755 win32build/VS2008/libdhcp/libdhcp.vcproj
 create mode 100755 win32build/VS2008/libdhcp_tests/libdhcp_tests.vcproj
 create mode 100755 win32build/VS2008/libdnsacl/libdnsacl.vcproj
 create mode 100755 win32build/VS2008/libfake_session/libfake_session.vcproj
 create mode 100755 win32build/VS2008/liblog_example/liblog_example.vcproj
 create mode 100755 win32build/VS2008/liblog_iltest/liblog_iltest.vcproj
 create mode 100755 win32build/VS2008/pydacl/pydacl.vcproj
 create mode 100755 win32build/VS2008/pyddatasrc/pyddatasrc.vcproj
 create mode 100755 win32build/VS2008/pyddns++/pyddns++.vcproj
 create mode 100755 win32build/VS2008/pyddnsacl/pyddnsacl.vcproj
 create mode 100755 win32build/VS2008/pydlog/pydlog.vcproj
 create mode 100755 win32build/VS2008/pydutil_io/pydutil_io.vcproj
 create mode 100755 win32build/VS2008/tt-badpacket/tt-badpacket.vcproj
 create mode 100755 win32build/VS2008/tt-badpacket_tests/tt-badpacket_tests.vcproj

-----------------------------------------------------------------------
diff --git a/WIN32-NOTES b/WIN32-NOTES
index ca209c5..656d0b5 100644
--- a/WIN32-NOTES
+++ b/WIN32-NOTES
@@ -6,8 +6,8 @@ What is needed:
  - POSIX (aka Unix) environment for tar/git/etc (I use cygwin)
 
  - Visual Studio C++ (versions 2008 and 2010 were tested,
-  note older versions could fail to correctly compile,
-  cf. C4373 warning, 2010 express and 64 bit support
+  (note older versions could fail to correctly compile,
+  cf. C4373 warning), 2010 express and 64 bit support
   from the 7.1 SDK work too)
 
  - python >= 3.1 (I got Cpython 3.2 MSI from python.org,
@@ -26,7 +26,8 @@ What is needed:
 
  - cmakefile (got the 2.8.4 .exe, can be used but see below)
 
- - google test (aka gtest, got the 1.[56].0 sources)
+ - google test (aka gtest, got the 1.[56].0 sources but some recent
+  tests require >= 1.6.0)
 
  - boost >= 1.35 (got the 1.44/1.46 setup from Boostpro, installed
   Multithread and Multithread Debug)
@@ -41,8 +42,6 @@ What is needed:
   Note WIN32 disables syslog support)
 
 Environment variables:
- (for VS2010 now)
-
  - BOOST -> C:\Program Files\boost\boost_1_44
 
  - BIND10HOME -> c:/cygwin/home/dupont/bind10.trac826
@@ -63,7 +62,7 @@ How to recompile python:
 
  - solution file is in PCbuild/pcbuild.sln
 
- - patch socketmodule.h with:
+ - patch socketmodule.h with (can replace WIN7 by WS08, etc):
 
 #else /* MS_WINDOWS */
 # define NTDDI_VERSION NTDDI_WIN7
@@ -99,7 +98,6 @@ Where I put things (hardwired paths):
    (--disable-shared to get static libs, no DLL)
 
  - <home>\log4cplus\include and <home>\log4cplus\md{9,10}\{Debug,Release}
-   (tested only for VS 2010 / md10)
 
  - "C:\Program Files\boost\boost_1_44" (the include and
   sometimes the libraries (in lib, called by the auto_link) too,
@@ -108,8 +106,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 with a copy
-  in the current directory?)
+  on Window7 I can't get the permissions right but it works by putting
+  the DLL directory in the PATH)
 
 How to compile:
 
diff --git a/src/bin/resolver/main.cc b/src/bin/resolver/main.cc
index 9b5faf6..1ea75e7 100644
--- a/src/bin/resolver/main.cc
+++ b/src/bin/resolver/main.cc
@@ -17,6 +17,7 @@
 #ifdef _WIN32
 #include <getopt.h>
 #include <ws2tcpip.h>
+#include <mswsock.h>
 #else
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/src/bin/resolver/resolver.cc b/src/bin/resolver/resolver.cc
index d1ba0eb..e98d08f 100644
--- a/src/bin/resolver/resolver.cc
+++ b/src/bin/resolver/resolver.cc
@@ -15,7 +15,10 @@
 #include <config.h>
 
 #include <stdint.h>
-#ifndef _WIN32
+#ifdef _WIN32
+#include <ws2tcpip.h>
+#include <mswsock.h>
+#else
 #include <netinet/in.h>
 #endif
 
diff --git a/src/bin/resolver/tests/resolver_config_unittest.cc b/src/bin/resolver/tests/resolver_config_unittest.cc
index b3a0a7d..fe7a8cc 100644
--- a/src/bin/resolver/tests/resolver_config_unittest.cc
+++ b/src/bin/resolver/tests/resolver_config_unittest.cc
@@ -16,6 +16,7 @@
 
 #ifdef _WIN32
 #include <ws2tcpip.h>
+#include <mswsock.h>
 #endif
 
 #include <string>
diff --git a/src/bin/resolver/tests/resolver_unittest.cc b/src/bin/resolver/tests/resolver_unittest.cc
index 80c209a..0e7b8a6 100644
--- a/src/bin/resolver/tests/resolver_unittest.cc
+++ b/src/bin/resolver/tests/resolver_unittest.cc
@@ -16,6 +16,7 @@
 
 #ifdef _WIN32
 #include <ws2tcpip.h>
+#include <mswsock.h>
 #endif
 
 #include <string>
diff --git a/src/lib/datasrc/tests/database_unittest.cc b/src/lib/datasrc/tests/database_unittest.cc
index 774a52e..6315b54 100644
--- a/src/lib/datasrc/tests/database_unittest.cc
+++ b/src/lib/datasrc/tests/database_unittest.cc
@@ -1749,7 +1749,8 @@ TYPED_TEST(DatabaseClientTest, getOrigin) {
     if (this->is_mock_) {
         EXPECT_EQ(READONLY_ZONE_ID, finder->zone_id());
     }
-    EXPECT_EQ(this->zname_, finder->getOrigin());
+    bool test(this->zname_ == finder->getOrigin());
+    EXPECT_EQ(test, true);
 }
 
 TYPED_TEST(DatabaseClientTest, updaterFinder) {
diff --git a/src/lib/dhcp/tests/libdhcp_unittest.cc b/src/lib/dhcp/tests/libdhcp_unittest.cc
index d68da77..2bff539 100644
--- a/src/lib/dhcp/tests/libdhcp_unittest.cc
+++ b/src/lib/dhcp/tests/libdhcp_unittest.cc
@@ -110,46 +110,46 @@ TEST_F(LibDhcpTest, unpackOptions6) {
     EXPECT_EQ(options.size(), 5); // there should be 5 options
 
     isc::dhcp::Option::Option6Lst::const_iterator x = options.find(12);
-    ASSERT_NE(x, options.end()); // option 1 should exist
+    ASSERT_FALSE(x == options.end()); // option 12 should exist
     EXPECT_EQ(12, x->second->getType());  // this should be option 12
     ASSERT_EQ(9, x->second->len()); // it should be of length 9
     EXPECT_EQ(0, memcmp(x->second->getData(), packed+4, 5)); // data len=5
 
     x = options.find(13);
-    ASSERT_NE(x, options.end()); // option 13 should exist
+    ASSERT_FALSE(x == options.end()); // option 13 should exist
     EXPECT_EQ(13, x->second->getType());  // this should be option 13
     ASSERT_EQ(7, x->second->len()); // it should be of length 7
     EXPECT_EQ(0, memcmp(x->second->getData(), packed+13, 3)); // data len=3
 
     x = options.find(14);
-    ASSERT_NE(x, options.end()); // option 3 should exist
+    ASSERT_FALSE(x == options.end()); // option 3 should exist
     EXPECT_EQ(14, x->second->getType());  // this should be option 14
     ASSERT_EQ(6, x->second->len()); // it should be of length 6
     EXPECT_EQ(0, memcmp(x->second->getData(), packed+20, 2)); // data len=2
 
     x = options.find(256);
-    ASSERT_NE(x, options.end()); // option 256 should exist
+    ASSERT_FALSE(x == options.end()); // option 256 should exist
     EXPECT_EQ(256, x->second->getType());  // this should be option 256
     ASSERT_EQ(8, x->second->len()); // it should be of length 7
     EXPECT_EQ(0, memcmp(x->second->getData(), packed+26, 4)); // data len=4
 
     x = options.find(257);
-    ASSERT_NE(x, options.end()); // option 257 should exist
+    ASSERT_FALSE(x == options.end()); // option 257 should exist
     EXPECT_EQ(257, x->second->getType());  // this should be option 257
     ASSERT_EQ(5, x->second->len()); // it should be of length 5
     EXPECT_EQ(0, memcmp(x->second->getData(), packed+34, 1)); // data len=1
 
     x = options.find(0);
-    EXPECT_EQ(x, options.end()); // option 0 not found
+    EXPECT_TRUE(x == options.end()); // option 0 not found
 
     x = options.find(1); // 1 is htons(256) on little endians. Worth checking
-    EXPECT_EQ(x, options.end()); // option 1 not found
+    EXPECT_TRUE(x == options.end()); // option 1 not found
 
     x = options.find(2);
-    EXPECT_EQ(x, options.end()); // option 2 not found
+    EXPECT_TRUE(x == options.end()); // option 2 not found
 
     x = options.find(32000);
-    EXPECT_EQ(x, options.end()); // option 32000 not found
+    EXPECT_TRUE(x == options.end()); // option 32000 not found
 }
 
 }
diff --git a/win32build/VS2008/b10-dhcp6/b10-dhcp6.vcproj b/win32build/VS2008/b10-dhcp6/b10-dhcp6.vcproj
new file mode 100755
index 0000000..4e1299f
--- /dev/null
+++ b/win32build/VS2008/b10-dhcp6/b10-dhcp6.vcproj
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="b10-dhcp6"
+	ProjectGUID="{3D19B634-75D8-4E99-8AF6-032AA67B0353}"
+	RootNamespace="b10dhcp6"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\bin\dhcp6&#x0D;&#x0A;copy spec_config.h.win32 spec_config.h&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\bin;..\..\..\ext\asio;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib liblog.lib libcc.lib libcfgclient.lib libasiolink.lib libdhcp.lib log4cplusSD.lib iphlpapi.lib"
+				OutputFile="$(OutDir)\b10-dhcp6.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libcfgclient\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libdhcp\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"$(BOOST)\lib""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\bin\dhcp6&#x0D;&#x0A;copy spec_config.h.win32 spec_config.h&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\bin;..\..\..\ext\asio;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib liblog.lib libcc.lib libcfgclient.lib libasiolink.lib libdhcp.lib log4cplusS.lib iphlpapi.lib"
+				OutputFile="$(OutDir)\b10-dhcp6.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libcfgclient\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libdhcp\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"$(BOOST)\lib""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\src\bin\dhcp6\dhcp6_srv.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\getopt.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\dhcp6\iface_mgr.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\dhcp6\main.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\dhcp6\pkt6.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\src\bin\dhcp6\dhcp6.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\dhcp6\dhcp6_srv.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\getopt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\dhcp6\iface_mgr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\dhcp6\pkt6.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\dhcp6\spec_config.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/b10-dhcp6_tests/b10-dhcp6_tests.vcproj b/win32build/VS2008/b10-dhcp6_tests/b10-dhcp6_tests.vcproj
new file mode 100755
index 0000000..7671813
--- /dev/null
+++ b/win32build/VS2008/b10-dhcp6_tests/b10-dhcp6_tests.vcproj
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="b10-dhcp6_tests"
+	ProjectGUID="{C40A319A-A08A-4482-A68D-2A5754778D7D}"
+	RootNamespace="b10dhcp6_tests"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\bin;..\..\..\ext\asio;"$(BOOST)";..\..\..\..\gtest\include"
+				PreprocessorDefinitions="TEST_DATA_DIR=\"$(BIND10HOME)/src/lib/testutils/testdata\";TEST_DATA_BUILDDIR=\"$(BIND10HOME)/src/lib/testutils/testdata\""
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libcc.lib libcfgclient.lib libasiolink.lib libdhcp.lib log4cplusSD.lib gtestd.lib iphlpapi.lib"
+				OutputFile="$(OutDir)\dhcp6_unittests.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libcfgclient\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libdhcp\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";"$(BOOST)\lib""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\bin;..\..\..\ext\asio;"$(BOOST)";..\..\..\..\gtest\include"
+				PreprocessorDefinitions="TEST_DATA_DIR=\"$(BIND10HOME)/src/lib/testutils/testdata\";TEST_DATA_BUILDDIR=\"$(BIND10HOME)/src/lib/testutils/testdata\""
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libcc.lib libcfgclient.lib libasiolink.lib libdhcp.lib log4cplusS.lib gtest.lib iphlpapi.lib"
+				OutputFile="$(OutDir)\dhcp6_unittests.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libcfgclient\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libdhcp\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";"$(BOOST)\lib""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\src\bin\dhcp6\dhcp6_srv.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\dhcp6\tests\dhcp6_srv_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\dhcp6\tests\dhcp6_unittests.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\dhcp6\iface_mgr.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\dhcp6\tests\iface_mgr_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\dhcp6\pkt6.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\dhcp6\tests\pkt6_unittest.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\src\bin\dhcp6\dhcp6_srv.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\dhcp6\iface_mgr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\dhcp6\pkt6.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/b10-host/b10-host.vcproj b/win32build/VS2008/b10-host/b10-host.vcproj
new file mode 100755
index 0000000..7f89aa4
--- /dev/null
+++ b/win32build/VS2008/b10-host/b10-host.vcproj
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="b10-host"
+	ProjectGUID="{BBF802E6-B6CB-4C58-A0FD-C2DF0F2ADEC2}"
+	RootNamespace="b10host"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libcryptolink.lib libdns++.lib botan.lib ws2_32.lib"
+				OutputFile="$(OutDir)\b10-host.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libcryptolink.lib libdns++.lib botan.lib ws2_32.lib"
+				OutputFile="$(OutDir)\b10-host.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\getopt.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\host\host.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\getopt.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/b10-resolver/b10-resolver.vcproj b/win32build/VS2008/b10-resolver/b10-resolver.vcproj
new file mode 100755
index 0000000..8c81e7d
--- /dev/null
+++ b/win32build/VS2008/b10-resolver/b10-resolver.vcproj
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="b10-resolver"
+	ProjectGUID="{2F08DDA1-4175-45E0-92C1-D5919199F543}"
+	RootNamespace="b10resolver"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\bin\resolver&#x0D;&#x0A;..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe resolver_messages.mes&#x0D;&#x0A;copy resolver.spec.pre.win32 resolver.spec&#x0D;&#x0A;copy spec_config.h.pre.win32 spec_config.h&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\bin;..\..\..\src\bin\resolver;..\..\..\ext\asio;"$(BOOST)""
+				PreprocessorDefinitions="BIND10HOME=\"$(BIND10HOME)\""
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib liblog.lib libcryptolink.lib libdns++.lib libcc.lib libcfgclient.lib libacl.lib libdnsacl.lib libasiolink.lib libasiodns.lib libnsas.lib libcache.lib libresolve.lib libserver_common.lib log4cplusSD.lib botan.lib"
+				OutputFile="$(OutDir)\b10-resolver.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libcfgclient\$(ConfigurationName)";"..\libacl\$(ConfigurationName)";"..\libdnsacl\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libasiodns\$(ConfigurationName)";"..\libnsas\$(ConfigurationName)";"..\libcache\$(ConfigurationName)";"..\libresolve\$(ConfigurationName)";"..\libserver_common\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"$(BOOST)\lib""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\bin\resolver&#x0D;&#x0A;..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe resolver_messages.mes&#x0D;&#x0A;copy resolver.spec.pre.win32 resolver.spec&#x0D;&#x0A;copy spec_config.h.pre.win32 spec_config.h&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\bin;..\..\..\src\bin\resolver;..\..\..\ext\asio;"$(BOOST)""
+				PreprocessorDefinitions="BIND10HOME=\"$(BIND10HOME)\""
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib liblog.lib libcryptolink.lib libdns++.lib libcc.lib libcfgclient.lib libacl.lib libdnsacl.lib libasiolink.lib libasiodns.lib libnsas.lib libcache.lib libresolve.lib libserver_common.lib log4cplusS.lib botan.lib"
+				OutputFile="$(OutDir)\b10-resolver.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libcfgclient\$(ConfigurationName)";"..\libacl\$(ConfigurationName)";"..\libdnsacl\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libasiodns\$(ConfigurationName)";"..\libnsas\$(ConfigurationName)";"..\libcache\$(ConfigurationName)";"..\libresolve\$(ConfigurationName)";"..\libserver_common\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"$(BOOST)\lib""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\getopt.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\main.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\resolver.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\resolver_log.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\resolver_messages.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\response_scrubber.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\getopt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\resolver.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\resolver_log.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\resolver_messages.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\response_scrubber.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\spec_config.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/b10-resolver_tests/b10-resolver_tests.vcproj b/win32build/VS2008/b10-resolver_tests/b10-resolver_tests.vcproj
new file mode 100755
index 0000000..2ce12de
--- /dev/null
+++ b/win32build/VS2008/b10-resolver_tests/b10-resolver_tests.vcproj
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="b10-resolver_tests"
+	ProjectGUID="{197FDB8D-FAE9-498A-B55B-E009932CD196}"
+	RootNamespace="b10resolver_tests"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\bin;..\..\..\ext\asio;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="TEST_DATA_DIR=\"$(BIND10HOME)/src/lib/testutils/testdata\";TEST_DATA_BUILDDIR=\"$(BIND10HOME)/src/lib/testutils/testdata\""
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libcryptolink.lib libdns++.lib libcc.lib libcfgclient.lib libacl.lib libdnsacl.lib libasiolink.lib libasiodns.lib libnsas.lib libcache.lib libresolve.lib libtestutils.lib libserver_common.lib log4cplusSD.lib botan.lib gtestd.lib"
+				OutputFile="$(OutDir)\run_unittests.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libcfgclient\$(ConfigurationName)";"..\libacl\$(ConfigurationName)";"..\libdnsacl\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libasiodns\$(ConfigurationName)";"..\libnsas\$(ConfigurationName)";"..\libcache\$(ConfigurationName)";"..\libresolve\$(ConfigurationName)";"..\libtestutils\$(ConfigurationName)";"..\libserver_common\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(Configuratio
 nName)";"$(BOOST)\lib""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\bin;..\..\..\ext\asio;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="TEST_DATA_DIR=\"$(BIND10HOME)/src/lib/testutils/testdata\";TEST_DATA_BUILDDIR=\"$(BIND10HOME)/src/lib/testutils/testdata\""
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libcryptolink.lib libdns++.lib libcc.lib libcfgclient.lib libacl.lib libdnsacl.lib libasiolink.lib libasiodns.lib libnsas.lib libcache.lib libresolve.lib libtestutils.lib libserver_common.lib log4cplusS.lib botan.lib gtest.lib"
+				OutputFile="$(OutDir)\run_unittests.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libcfgclient\$(ConfigurationName)";"..\libacl\$(ConfigurationName)";"..\libdnsacl\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libasiodns\$(ConfigurationName)";"..\libnsas\$(ConfigurationName)";"..\libcache\$(ConfigurationName)";"..\libresolve\$(ConfigurationName)";"..\libtestutils\$(ConfigurationName)";"..\libserver_common\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(Configuratio
 nName)";"$(BOOST)\lib""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\resolver.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\tests\resolver_config_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\resolver_log.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\resolver_messages.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\tests\resolver_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\response_scrubber.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\tests\response_scrubber_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\tests\run_unittests.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\tests\unittest_util.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\resolver.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\resolver_log.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\resolver_messages.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\bin\resolver\response_scrubber.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\tests\unittest_util.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/bind10.sln b/win32build/VS2008/bind10.sln
index dd037e1..64619cc 100755
--- a/win32build/VS2008/bind10.sln
+++ b/win32build/VS2008/bind10.sln
@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BINDInstall", "BINDInstall\BINDInstall.vcproj", "{037FE4D5-39B8-4E16-9079-77954AFA21DB}"
 	ProjectSection(ProjectDependencies) = postProject
+		{9C6C5E00-5D4F-4149-88A7-AFDCDC7C5017} = {9C6C5E00-5D4F-4149-88A7-AFDCDC7C5017}
+		{09471D02-D601-4EFA-B342-0DCFE9082737} = {09471D02-D601-4EFA-B342-0DCFE9082737}
 		{AFA7E20B-A78A-40E9-9639-D131D035C265} = {AFA7E20B-A78A-40E9-9639-D131D035C265}
 		{634A520C-3085-4ACF-BE49-79E01FFCA04F} = {634A520C-3085-4ACF-BE49-79E01FFCA04F}
 		{D71CA80E-7EBA-4ED2-9529-A2A309A43B95} = {D71CA80E-7EBA-4ED2-9529-A2A309A43B95}
@@ -10,24 +12,39 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BINDInstall", "BINDInstall\
 		{DF221D13-B0BD-4984-9EEF-943578CF4B11} = {DF221D13-B0BD-4984-9EEF-943578CF4B11}
 		{0633A915-9440-4A79-BA4E-070CC0140F72} = {0633A915-9440-4A79-BA4E-070CC0140F72}
 		{639C8A1D-99DF-4ACA-9755-A51E77FC6EC4} = {639C8A1D-99DF-4ACA-9755-A51E77FC6EC4}
+		{B564FA1E-1B2F-42A9-9A2F-F340DC430848} = {B564FA1E-1B2F-42A9-9A2F-F340DC430848}
 		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
 		{79A26930-8CC4-4D98-A899-B4FDF1CE4DC5} = {79A26930-8CC4-4D98-A899-B4FDF1CE4DC5}
+		{C5617D33-76BA-4388-AB0E-FC06CFAAA865} = {C5617D33-76BA-4388-AB0E-FC06CFAAA865}
+		{3D19B634-75D8-4E99-8AF6-032AA67B0353} = {3D19B634-75D8-4E99-8AF6-032AA67B0353}
 		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
 		{8AAF0639-A368-4BE2-81E1-668D0C81FB8F} = {8AAF0639-A368-4BE2-81E1-668D0C81FB8F}
 		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
+		{11EA2746-8E45-4146-86F3-301DEC338E8B} = {11EA2746-8E45-4146-86F3-301DEC338E8B}
+		{B14E334B-B2E5-4A7E-8A55-157BD70ECBE5} = {B14E334B-B2E5-4A7E-8A55-157BD70ECBE5}
 		{9437FF4D-3CCE-45F1-A248-6B713FBF0A5D} = {9437FF4D-3CCE-45F1-A248-6B713FBF0A5D}
-		{6AF54258-C144-4C6B-A10F-DA6D17193B5D} = {6AF54258-C144-4C6B-A10F-DA6D17193B5D}
+		{D20A3656-A6C5-4838-B20B-0329DE0AB187} = {D20A3656-A6C5-4838-B20B-0329DE0AB187}
 		{7D9DD35B-A97E-4EF9-8FCA-2D85F8EA649E} = {7D9DD35B-A97E-4EF9-8FCA-2D85F8EA649E}
+		{3E487E5C-9AE5-4F08-ACCC-448B0C0BE732} = {3E487E5C-9AE5-4F08-ACCC-448B0C0BE732}
 		{F4D89262-37A8-401B-8ABD-D0E18E13E5D1} = {F4D89262-37A8-401B-8ABD-D0E18E13E5D1}
+		{C138D564-102E-42AB-947B-C96B0F4A0A1A} = {C138D564-102E-42AB-947B-C96B0F4A0A1A}
 		{0131E967-F93E-4E63-9561-47C94411FBEC} = {0131E967-F93E-4E63-9561-47C94411FBEC}
+		{50427469-52BA-4961-80AF-7591198BB1D2} = {50427469-52BA-4961-80AF-7591198BB1D2}
 		{CF7DB86A-D67D-4829-B63A-598E5BFC81BC} = {CF7DB86A-D67D-4829-B63A-598E5BFC81BC}
+		{69A17480-26D6-4E58-A3C4-0EE726E80A7C} = {69A17480-26D6-4E58-A3C4-0EE726E80A7C}
 		{42347681-5872-4D67-9E6B-CD0AA822DEE4} = {42347681-5872-4D67-9E6B-CD0AA822DEE4}
-		{DE8D2C87-5DDF-4A8A-954D-64B21BCB71AE} = {DE8D2C87-5DDF-4A8A-954D-64B21BCB71AE}
+		{8AC71185-0619-477C-8C15-0E59D6DEB127} = {8AC71185-0619-477C-8C15-0E59D6DEB127}
 		{C49C6288-0381-4F7F-AD11-6E122095A876} = {C49C6288-0381-4F7F-AD11-6E122095A876}
+		{197FDB8D-FAE9-498A-B55B-E009932CD196} = {197FDB8D-FAE9-498A-B55B-E009932CD196}
 		{AB337F8E-F8DD-4013-9638-8585BF087158} = {AB337F8E-F8DD-4013-9638-8585BF087158}
-		{2FEC189D-5EE1-452B-9BE5-EFF8F7B45466} = {2FEC189D-5EE1-452B-9BE5-EFF8F7B45466}
+		{540ADC90-BF19-4F34-8D44-B415EAEF2338} = {540ADC90-BF19-4F34-8D44-B415EAEF2338}
+		{7CFE4391-06F6-4DB2-B631-04BC5D4A40CE} = {7CFE4391-06F6-4DB2-B631-04BC5D4A40CE}
+		{C40A319A-A08A-4482-A68D-2A5754778D7D} = {C40A319A-A08A-4482-A68D-2A5754778D7D}
 		{E8E425A1-74C4-43B2-9DE9-F59E496333F0} = {E8E425A1-74C4-43B2-9DE9-F59E496333F0}
+		{2F08DDA1-4175-45E0-92C1-D5919199F543} = {2F08DDA1-4175-45E0-92C1-D5919199F543}
+		{101C12A4-E84C-4751-A3C6-CB72DE3A4ABC} = {101C12A4-E84C-4751-A3C6-CB72DE3A4ABC}
 		{B18D03AA-EC46-4AAD-90BA-A6ED843DB7FB} = {B18D03AA-EC46-4AAD-90BA-A6ED843DB7FB}
+		{2E6C27B1-94FA-4C1B-8338-1A650E05B375} = {2E6C27B1-94FA-4C1B-8338-1A650E05B375}
 		{93F88AB1-78D9-41B1-A534-66D64D4B5C54} = {93F88AB1-78D9-41B1-A534-66D64D4B5C54}
 		{9ABB5EB9-7742-4EBE-955A-0AE81B5878BA} = {9ABB5EB9-7742-4EBE-955A-0AE81B5878BA}
 		{07413DBE-6012-422E-8531-2F7579C2C800} = {07413DBE-6012-422E-8531-2F7579C2C800}
@@ -35,11 +52,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BINDInstall", "BINDInstall\
 		{2BE3E9BE-0536-42F4-8932-827C6C172109} = {2BE3E9BE-0536-42F4-8932-827C6C172109}
 		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
 		{38F600CA-1FAF-4BF2-A4D5-B82569C156BC} = {38F600CA-1FAF-4BF2-A4D5-B82569C156BC}
+		{3ADF20CD-D230-4911-8BC6-5D394EF54A95} = {3ADF20CD-D230-4911-8BC6-5D394EF54A95}
 		{AB83FDCD-7D87-4866-A490-75DFAB68B361} = {AB83FDCD-7D87-4866-A490-75DFAB68B361}
 		{490FACD4-B54B-40A7-A39F-2EB60B307CEC} = {490FACD4-B54B-40A7-A39F-2EB60B307CEC}
 		{AA3B87DA-D863-46D6-9B6C-CFEC091BAC10} = {AA3B87DA-D863-46D6-9B6C-CFEC091BAC10}
 		{F25691DE-F8D2-4CFC-8053-67539BD53AD4} = {F25691DE-F8D2-4CFC-8053-67539BD53AD4}
 		{965D13E1-0E6C-46BF-AFDB-ABFBAFFAA2F4} = {965D13E1-0E6C-46BF-AFDB-ABFBAFFAA2F4}
+		{BBF802E6-B6CB-4C58-A0FD-C2DF0F2ADEC2} = {BBF802E6-B6CB-4C58-A0FD-C2DF0F2ADEC2}
 		{99678BE6-B8EB-4740-9E67-C90C84158785} = {99678BE6-B8EB-4740-9E67-C90C84158785}
 		{593ECCEC-BB6C-449A-911A-6214460AE993} = {593ECCEC-BB6C-449A-911A-6214460AE993}
 		{5E884AFC-FB00-4045-A339-113F36D12C86} = {5E884AFC-FB00-4045-A339-113F36D12C86}
@@ -60,19 +79,25 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libutil_tests", "libutil_tests\libutil_tests.vcproj", "{634A520C-3085-4ACF-BE49-79E01FFCA04F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
+		{E1DCE3BE-46BC-444F-927C-714414FDC457} = {E1DCE3BE-46BC-444F-927C-714414FDC457}
 		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libutil_unittests", "libutil_unittests\libutil_unittests.vcproj", "{06BE7A3D-800D-4665-A250-9DB588CE7BBE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D20A3656-A6C5-4838-B20B-0329DE0AB187} = {D20A3656-A6C5-4838-B20B-0329DE0AB187}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcryptolink", "libcryptolink\libcryptolink.vcproj", "{F4D89262-37A8-401B-8ABD-D0E18E13E5D1}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1DCE3BE-46BC-444F-927C-714414FDC457} = {E1DCE3BE-46BC-444F-927C-714414FDC457}
+		{0633A915-9440-4A79-BA4E-070CC0140F72} = {0633A915-9440-4A79-BA4E-070CC0140F72}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcryptolink_tests", "libcryptolink_tests\libcryptolink_tests.vcproj", "{C49C6288-0381-4F7F-AD11-6E122095A876}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
 		{F4D89262-37A8-401B-8ABD-D0E18E13E5D1} = {F4D89262-37A8-401B-8ABD-D0E18E13E5D1}
 		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
 	EndProjectSection
@@ -94,17 +119,18 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdns++_python", "libdns++_python\libdns++_python.vcproj", "{8AAF0639-A368-4BE2-81E1-668D0C81FB8F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{AFA7E20B-A78A-40E9-9639-D131D035C265} = {AFA7E20B-A78A-40E9-9639-D131D035C265}
-		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
-		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcc", "libcc\libcc.vcproj", "{E8E425A1-74C4-43B2-9DE9-F59E496333F0}"
 	ProjectSection(ProjectDependencies) = postProject
-		{AFA7E20B-A78A-40E9-9639-D131D035C265} = {AFA7E20B-A78A-40E9-9639-D131D035C265}
+		{C5617D33-76BA-4388-AB0E-FC06CFAAA865} = {C5617D33-76BA-4388-AB0E-FC06CFAAA865}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcc_tests", "libcc_tests\libcc_tests.vcproj", "{0131E967-F93E-4E63-9561-47C94411FBEC}"
 	ProjectSection(ProjectDependencies) = postProject
+		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
+		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
 		{E8E425A1-74C4-43B2-9DE9-F59E496333F0} = {E8E425A1-74C4-43B2-9DE9-F59E496333F0}
 		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
 	EndProjectSection
@@ -116,6 +142,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcfgclient", "libcfgclien
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcfgclient_tests", "libcfgclient_tests\libcfgclient_tests.vcproj", "{B18D03AA-EC46-4AAD-90BA-A6ED843DB7FB}"
 	ProjectSection(ProjectDependencies) = postProject
+		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
+		{3E487E5C-9AE5-4F08-ACCC-448B0C0BE732} = {3E487E5C-9AE5-4F08-ACCC-448B0C0BE732}
 		{E8E425A1-74C4-43B2-9DE9-F59E496333F0} = {E8E425A1-74C4-43B2-9DE9-F59E496333F0}
 		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
 		{99678BE6-B8EB-4740-9E67-C90C84158785} = {99678BE6-B8EB-4740-9E67-C90C84158785}
@@ -123,24 +151,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcfgclient_tests", "libcf
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog", "liblog\liblog.vcproj", "{9494C92C-AF42-4897-B488-B5B416C2D392}"
 	ProjectSection(ProjectDependencies) = postProject
-		{490FACD4-B54B-40A7-A39F-2EB60B307CEC} = {490FACD4-B54B-40A7-A39F-2EB60B307CEC}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog_tests", "liblog_tests\liblog_tests.vcproj", "{9437FF4D-3CCE-45F1-A248-6B713FBF0A5D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
 		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog_compiler", "liblog_compiler\liblog_compiler.vcproj", "{0633A915-9440-4A79-BA4E-070CC0140F72}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
-		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libasiolink", "libasiolink\libasiolink.vcproj", "{D71CA80E-7EBA-4ED2-9529-A2A309A43B95}"
 	ProjectSection(ProjectDependencies) = postProject
-		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
+		{490FACD4-B54B-40A7-A39F-2EB60B307CEC} = {490FACD4-B54B-40A7-A39F-2EB60B307CEC}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libasiolink_tests", "libasiolink_tests\libasiolink_tests.vcproj", "{CF7DB86A-D67D-4829-B63A-598E5BFC81BC}"
@@ -148,6 +176,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libasiolink_tests", "libasi
 		{AFA7E20B-A78A-40E9-9639-D131D035C265} = {AFA7E20B-A78A-40E9-9639-D131D035C265}
 		{D71CA80E-7EBA-4ED2-9529-A2A309A43B95} = {D71CA80E-7EBA-4ED2-9529-A2A309A43B95}
 		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
+		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
 		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
 	EndProjectSection
 EndProject
@@ -162,6 +192,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libasiodns_tests", "libasio
 		{D71CA80E-7EBA-4ED2-9529-A2A309A43B95} = {D71CA80E-7EBA-4ED2-9529-A2A309A43B95}
 		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
 		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
+		{F4D89262-37A8-401B-8ABD-D0E18E13E5D1} = {F4D89262-37A8-401B-8ABD-D0E18E13E5D1}
 		{2BE3E9BE-0536-42F4-8932-827C6C172109} = {2BE3E9BE-0536-42F4-8932-827C6C172109}
 		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
 	EndProjectSection
@@ -176,7 +208,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnsas_tests", "libnsas_te
 		{AFA7E20B-A78A-40E9-9639-D131D035C265} = {AFA7E20B-A78A-40E9-9639-D131D035C265}
 		{D71CA80E-7EBA-4ED2-9529-A2A309A43B95} = {D71CA80E-7EBA-4ED2-9529-A2A309A43B95}
 		{99F5B212-3D33-4B0E-9878-82FEF4CC0FD0} = {99F5B212-3D33-4B0E-9878-82FEF4CC0FD0}
+		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
 		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
+		{F4D89262-37A8-401B-8ABD-D0E18E13E5D1} = {F4D89262-37A8-401B-8ABD-D0E18E13E5D1}
 		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
 	EndProjectSection
 EndProject
@@ -190,8 +225,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcache_tests", "libcache_
 		{AFA7E20B-A78A-40E9-9639-D131D035C265} = {AFA7E20B-A78A-40E9-9639-D131D035C265}
 		{D71CA80E-7EBA-4ED2-9529-A2A309A43B95} = {D71CA80E-7EBA-4ED2-9529-A2A309A43B95}
 		{99F5B212-3D33-4B0E-9878-82FEF4CC0FD0} = {99F5B212-3D33-4B0E-9878-82FEF4CC0FD0}
+		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
 		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
 		{7D9DD35B-A97E-4EF9-8FCA-2D85F8EA649E} = {7D9DD35B-A97E-4EF9-8FCA-2D85F8EA649E}
+		{F4D89262-37A8-401B-8ABD-D0E18E13E5D1} = {F4D89262-37A8-401B-8ABD-D0E18E13E5D1}
 		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
 	EndProjectSection
 EndProject
@@ -207,7 +245,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresolve_tests", "libreso
 		{99F5B212-3D33-4B0E-9878-82FEF4CC0FD0} = {99F5B212-3D33-4B0E-9878-82FEF4CC0FD0}
 		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
 		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
 		{7D9DD35B-A97E-4EF9-8FCA-2D85F8EA649E} = {7D9DD35B-A97E-4EF9-8FCA-2D85F8EA649E}
+		{F4D89262-37A8-401B-8ABD-D0E18E13E5D1} = {F4D89262-37A8-401B-8ABD-D0E18E13E5D1}
 		{2BE3E9BE-0536-42F4-8932-827C6C172109} = {2BE3E9BE-0536-42F4-8932-827C6C172109}
 		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
 		{38F600CA-1FAF-4BF2-A4D5-B82569C156BC} = {38F600CA-1FAF-4BF2-A4D5-B82569C156BC}
@@ -226,7 +266,10 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdatasrc_tests", "libdatasrc_tests\libdatasrc_tests.vcproj", "{639C8A1D-99DF-4ACA-9755-A51E77FC6EC4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{AFA7E20B-A78A-40E9-9639-D131D035C265} = {AFA7E20B-A78A-40E9-9639-D131D035C265}
+		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
 		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
+		{F4D89262-37A8-401B-8ABD-D0E18E13E5D1} = {F4D89262-37A8-401B-8ABD-D0E18E13E5D1}
 		{E8E425A1-74C4-43B2-9DE9-F59E496333F0} = {E8E425A1-74C4-43B2-9DE9-F59E496333F0}
 		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
 		{AB83FDCD-7D87-4866-A490-75DFAB68B361} = {AB83FDCD-7D87-4866-A490-75DFAB68B361}
@@ -243,10 +286,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libserver_common_tests", "l
 		{D71CA80E-7EBA-4ED2-9529-A2A309A43B95} = {D71CA80E-7EBA-4ED2-9529-A2A309A43B95}
 		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
 		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
+		{3E487E5C-9AE5-4F08-ACCC-448B0C0BE732} = {3E487E5C-9AE5-4F08-ACCC-448B0C0BE732}
+		{F4D89262-37A8-401B-8ABD-D0E18E13E5D1} = {F4D89262-37A8-401B-8ABD-D0E18E13E5D1}
+		{69A17480-26D6-4E58-A3C4-0EE726E80A7C} = {69A17480-26D6-4E58-A3C4-0EE726E80A7C}
 		{AB337F8E-F8DD-4013-9638-8585BF087158} = {AB337F8E-F8DD-4013-9638-8585BF087158}
 		{E8E425A1-74C4-43B2-9DE9-F59E496333F0} = {E8E425A1-74C4-43B2-9DE9-F59E496333F0}
 		{2BE3E9BE-0536-42F4-8932-827C6C172109} = {2BE3E9BE-0536-42F4-8932-827C6C172109}
 		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+		{99678BE6-B8EB-4740-9E67-C90C84158785} = {99678BE6-B8EB-4740-9E67-C90C84158785}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbench", "libbench\libbench.vcproj", "{490FACD4-B54B-40A7-A39F-2EB60B307CEC}"
@@ -258,6 +306,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbench_tests", "libbench_
 	ProjectSection(ProjectDependencies) = postProject
 		{AFA7E20B-A78A-40E9-9639-D131D035C265} = {AFA7E20B-A78A-40E9-9639-D131D035C265}
 		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
+		{F4D89262-37A8-401B-8ABD-D0E18E13E5D1} = {F4D89262-37A8-401B-8ABD-D0E18E13E5D1}
 		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
 		{490FACD4-B54B-40A7-A39F-2EB60B307CEC} = {490FACD4-B54B-40A7-A39F-2EB60B307CEC}
 	EndProjectSection
@@ -271,36 +321,214 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdns++_benchmarks", "libd
 	ProjectSection(ProjectDependencies) = postProject
 		{AFA7E20B-A78A-40E9-9639-D131D035C265} = {AFA7E20B-A78A-40E9-9639-D131D035C265}
 		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
+		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libutil_io", "libutil_io\libutil_io.vcproj", "{E1DCE3BE-46BC-444F-927C-714414FDC457}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxfr", "libxfr\libxfr.vcproj", "{101C12A4-E84C-4751-A3C6-CB72DE3A4ABC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{2E6C27B1-94FA-4C1B-8338-1A650E05B375} = {2E6C27B1-94FA-4C1B-8338-1A650E05B375}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfake_session", "libfake_session\libfake_session.vcproj", "{3E487E5C-9AE5-4F08-ACCC-448B0C0BE732}"
+	ProjectSection(ProjectDependencies) = postProject
+		{99678BE6-B8EB-4740-9E67-C90C84158785} = {99678BE6-B8EB-4740-9E67-C90C84158785}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pydutil_io", "pydutil_io\pydutil_io.vcproj", "{D20A3656-A6C5-4838-B20B-0329DE0AB187}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E1DCE3BE-46BC-444F-927C-714414FDC457} = {E1DCE3BE-46BC-444F-927C-714414FDC457}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyddns++", "pyddns++\pyddns++.vcproj", "{C5617D33-76BA-4388-AB0E-FC06CFAAA865}"
+	ProjectSection(ProjectDependencies) = postProject
+		{8AAF0639-A368-4BE2-81E1-668D0C81FB8F} = {8AAF0639-A368-4BE2-81E1-668D0C81FB8F}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libacl", "libacl\libacl.vcproj", "{69A17480-26D6-4E58-A3C4-0EE726E80A7C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3E487E5C-9AE5-4F08-ACCC-448B0C0BE732} = {3E487E5C-9AE5-4F08-ACCC-448B0C0BE732}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdnsacl", "libdnsacl\libdnsacl.vcproj", "{2E6C27B1-94FA-4C1B-8338-1A650E05B375}"
+	ProjectSection(ProjectDependencies) = postProject
+		{69A17480-26D6-4E58-A3C4-0EE726E80A7C} = {69A17480-26D6-4E58-A3C4-0EE726E80A7C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libacl_tests", "libacl_tests\libacl_tests.vcproj", "{540ADC90-BF19-4F34-8D44-B415EAEF2338}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AFA7E20B-A78A-40E9-9639-D131D035C265} = {AFA7E20B-A78A-40E9-9639-D131D035C265}
+		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
+		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
+		{69A17480-26D6-4E58-A3C4-0EE726E80A7C} = {69A17480-26D6-4E58-A3C4-0EE726E80A7C}
+		{E8E425A1-74C4-43B2-9DE9-F59E496333F0} = {E8E425A1-74C4-43B2-9DE9-F59E496333F0}
+		{2E6C27B1-94FA-4C1B-8338-1A650E05B375} = {2E6C27B1-94FA-4C1B-8338-1A650E05B375}
+		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdhcp", "libdhcp\libdhcp.vcproj", "{3ADF20CD-D230-4911-8BC6-5D394EF54A95}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AB337F8E-F8DD-4013-9638-8585BF087158} = {AB337F8E-F8DD-4013-9638-8585BF087158}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdhcp_tests", "libdhcp_tests\libdhcp_tests.vcproj", "{9C6C5E00-5D4F-4149-88A7-AFDCDC7C5017}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D71CA80E-7EBA-4ED2-9529-A2A309A43B95} = {D71CA80E-7EBA-4ED2-9529-A2A309A43B95}
+		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
+		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
 		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+		{3ADF20CD-D230-4911-8BC6-5D394EF54A95} = {3ADF20CD-D230-4911-8BC6-5D394EF54A95}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog_rtitest", "liblog_rtitest\liblog_rtitest.vcproj", "{DE8D2C87-5DDF-4A8A-954D-64B21BCB71AE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog_example", "liblog_example\liblog_example.vcproj", "{7CFE4391-06F6-4DB2-B631-04BC5D4A40CE}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
 		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libutil_io", "libutil_io\libutil_io.vcproj", "{E1DCE3BE-46BC-444F-927C-714414FDC457}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog_iltest", "liblog_iltest\liblog_iltest.vcproj", "{11EA2746-8E45-4146-86F3-301DEC338E8B}"
 	ProjectSection(ProjectDependencies) = postProject
+		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
 		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libutil_io_tests", "libutil_io_tests\libutil_io_tests.vcproj", "{2FEC189D-5EE1-452B-9BE5-EFF8F7B45466}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pydacl", "pydacl\pydacl.vcproj", "{C138D564-102E-42AB-947B-C96B0F4A0A1A}"
 	ProjectSection(ProjectDependencies) = postProject
+		{69A17480-26D6-4E58-A3C4-0EE726E80A7C} = {69A17480-26D6-4E58-A3C4-0EE726E80A7C}
+		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyddnsacl", "pyddnsacl\pyddnsacl.vcproj", "{50427469-52BA-4961-80AF-7591198BB1D2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AFA7E20B-A78A-40E9-9639-D131D035C265} = {AFA7E20B-A78A-40E9-9639-D131D035C265}
+		{69A17480-26D6-4E58-A3C4-0EE726E80A7C} = {69A17480-26D6-4E58-A3C4-0EE726E80A7C}
+		{E8E425A1-74C4-43B2-9DE9-F59E496333F0} = {E8E425A1-74C4-43B2-9DE9-F59E496333F0}
+		{2E6C27B1-94FA-4C1B-8338-1A650E05B375} = {2E6C27B1-94FA-4C1B-8338-1A650E05B375}
+		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyddatasrc", "pyddatasrc\pyddatasrc.vcproj", "{B564FA1E-1B2F-42A9-9A2F-F340DC430848}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AFA7E20B-A78A-40E9-9639-D131D035C265} = {AFA7E20B-A78A-40E9-9639-D131D035C265}
+		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
+		{79A26930-8CC4-4D98-A899-B4FDF1CE4DC5} = {79A26930-8CC4-4D98-A899-B4FDF1CE4DC5}
+		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{8AAF0639-A368-4BE2-81E1-668D0C81FB8F} = {8AAF0639-A368-4BE2-81E1-668D0C81FB8F}
+		{F4D89262-37A8-401B-8ABD-D0E18E13E5D1} = {F4D89262-37A8-401B-8ABD-D0E18E13E5D1}
+		{E8E425A1-74C4-43B2-9DE9-F59E496333F0} = {E8E425A1-74C4-43B2-9DE9-F59E496333F0}
+		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pydlog", "pydlog\pydlog.vcproj", "{B14E334B-B2E5-4A7E-8A55-157BD70ECBE5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
+		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{E8E425A1-74C4-43B2-9DE9-F59E496333F0} = {E8E425A1-74C4-43B2-9DE9-F59E496333F0}
+		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+		{99678BE6-B8EB-4740-9E67-C90C84158785} = {99678BE6-B8EB-4740-9E67-C90C84158785}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "b10-host", "b10-host\b10-host.vcproj", "{BBF802E6-B6CB-4C58-A0FD-C2DF0F2ADEC2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AFA7E20B-A78A-40E9-9639-D131D035C265} = {AFA7E20B-A78A-40E9-9639-D131D035C265}
+		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{F4D89262-37A8-401B-8ABD-D0E18E13E5D1} = {F4D89262-37A8-401B-8ABD-D0E18E13E5D1}
+		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "b10-resolver", "b10-resolver\b10-resolver.vcproj", "{2F08DDA1-4175-45E0-92C1-D5919199F543}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AFA7E20B-A78A-40E9-9639-D131D035C265} = {AFA7E20B-A78A-40E9-9639-D131D035C265}
+		{D71CA80E-7EBA-4ED2-9529-A2A309A43B95} = {D71CA80E-7EBA-4ED2-9529-A2A309A43B95}
+		{99F5B212-3D33-4B0E-9878-82FEF4CC0FD0} = {99F5B212-3D33-4B0E-9878-82FEF4CC0FD0}
+		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
+		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{7D9DD35B-A97E-4EF9-8FCA-2D85F8EA649E} = {7D9DD35B-A97E-4EF9-8FCA-2D85F8EA649E}
+		{F4D89262-37A8-401B-8ABD-D0E18E13E5D1} = {F4D89262-37A8-401B-8ABD-D0E18E13E5D1}
+		{69A17480-26D6-4E58-A3C4-0EE726E80A7C} = {69A17480-26D6-4E58-A3C4-0EE726E80A7C}
+		{AB337F8E-F8DD-4013-9638-8585BF087158} = {AB337F8E-F8DD-4013-9638-8585BF087158}
+		{E8E425A1-74C4-43B2-9DE9-F59E496333F0} = {E8E425A1-74C4-43B2-9DE9-F59E496333F0}
+		{2E6C27B1-94FA-4C1B-8338-1A650E05B375} = {2E6C27B1-94FA-4C1B-8338-1A650E05B375}
+		{2BE3E9BE-0536-42F4-8932-827C6C172109} = {2BE3E9BE-0536-42F4-8932-827C6C172109}
+		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+		{38F600CA-1FAF-4BF2-A4D5-B82569C156BC} = {38F600CA-1FAF-4BF2-A4D5-B82569C156BC}
+		{99678BE6-B8EB-4740-9E67-C90C84158785} = {99678BE6-B8EB-4740-9E67-C90C84158785}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "b10-resolver_tests", "b10-resolver_tests\b10-resolver_tests.vcproj", "{197FDB8D-FAE9-498A-B55B-E009932CD196}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AFA7E20B-A78A-40E9-9639-D131D035C265} = {AFA7E20B-A78A-40E9-9639-D131D035C265}
+		{D71CA80E-7EBA-4ED2-9529-A2A309A43B95} = {D71CA80E-7EBA-4ED2-9529-A2A309A43B95}
+		{99F5B212-3D33-4B0E-9878-82FEF4CC0FD0} = {99F5B212-3D33-4B0E-9878-82FEF4CC0FD0}
+		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
+		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
 		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
-		{E1DCE3BE-46BC-444F-927C-714414FDC457} = {E1DCE3BE-46BC-444F-927C-714414FDC457}
+		{7D9DD35B-A97E-4EF9-8FCA-2D85F8EA649E} = {7D9DD35B-A97E-4EF9-8FCA-2D85F8EA649E}
+		{F4D89262-37A8-401B-8ABD-D0E18E13E5D1} = {F4D89262-37A8-401B-8ABD-D0E18E13E5D1}
+		{69A17480-26D6-4E58-A3C4-0EE726E80A7C} = {69A17480-26D6-4E58-A3C4-0EE726E80A7C}
+		{AB337F8E-F8DD-4013-9638-8585BF087158} = {AB337F8E-F8DD-4013-9638-8585BF087158}
+		{E8E425A1-74C4-43B2-9DE9-F59E496333F0} = {E8E425A1-74C4-43B2-9DE9-F59E496333F0}
+		{2F08DDA1-4175-45E0-92C1-D5919199F543} = {2F08DDA1-4175-45E0-92C1-D5919199F543}
+		{2E6C27B1-94FA-4C1B-8338-1A650E05B375} = {2E6C27B1-94FA-4C1B-8338-1A650E05B375}
+		{2BE3E9BE-0536-42F4-8932-827C6C172109} = {2BE3E9BE-0536-42F4-8932-827C6C172109}
+		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+		{38F600CA-1FAF-4BF2-A4D5-B82569C156BC} = {38F600CA-1FAF-4BF2-A4D5-B82569C156BC}
+		{AB83FDCD-7D87-4866-A490-75DFAB68B361} = {AB83FDCD-7D87-4866-A490-75DFAB68B361}
+		{99678BE6-B8EB-4740-9E67-C90C84158785} = {99678BE6-B8EB-4740-9E67-C90C84158785}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libutil_io_python", "libutil_io_python\libutil_io_python.vcproj", "{6AF54258-C144-4C6B-A10F-DA6D17193B5D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "b10-dhcp6", "b10-dhcp6\b10-dhcp6.vcproj", "{3D19B634-75D8-4E99-8AF6-032AA67B0353}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1DCE3BE-46BC-444F-927C-714414FDC457} = {E1DCE3BE-46BC-444F-927C-714414FDC457}
+		{D71CA80E-7EBA-4ED2-9529-A2A309A43B95} = {D71CA80E-7EBA-4ED2-9529-A2A309A43B95}
+		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
+		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{E8E425A1-74C4-43B2-9DE9-F59E496333F0} = {E8E425A1-74C4-43B2-9DE9-F59E496333F0}
+		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+		{3ADF20CD-D230-4911-8BC6-5D394EF54A95} = {3ADF20CD-D230-4911-8BC6-5D394EF54A95}
+		{99678BE6-B8EB-4740-9E67-C90C84158785} = {99678BE6-B8EB-4740-9E67-C90C84158785}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxfr", "libxfr\libxfr.vcproj", "{101C12A4-E84C-4751-A3C6-CB72DE3A4ABC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "b10-dhcp6_tests", "b10-dhcp6_tests\b10-dhcp6_tests.vcproj", "{C40A319A-A08A-4482-A68D-2A5754778D7D}"
 	ProjectSection(ProjectDependencies) = postProject
+		{D71CA80E-7EBA-4ED2-9529-A2A309A43B95} = {D71CA80E-7EBA-4ED2-9529-A2A309A43B95}
+		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
+		{3D19B634-75D8-4E99-8AF6-032AA67B0353} = {3D19B634-75D8-4E99-8AF6-032AA67B0353}
+		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
+		{E8E425A1-74C4-43B2-9DE9-F59E496333F0} = {E8E425A1-74C4-43B2-9DE9-F59E496333F0}
+		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+		{3ADF20CD-D230-4911-8BC6-5D394EF54A95} = {3ADF20CD-D230-4911-8BC6-5D394EF54A95}
 		{99678BE6-B8EB-4740-9E67-C90C84158785} = {99678BE6-B8EB-4740-9E67-C90C84158785}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tt-badpacket", "tt-badpacket\tt-badpacket.vcproj", "{09471D02-D601-4EFA-B342-0DCFE9082737}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AFA7E20B-A78A-40E9-9639-D131D035C265} = {AFA7E20B-A78A-40E9-9639-D131D035C265}
+		{D71CA80E-7EBA-4ED2-9529-A2A309A43B95} = {D71CA80E-7EBA-4ED2-9529-A2A309A43B95}
+		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
+		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{F4D89262-37A8-401B-8ABD-D0E18E13E5D1} = {F4D89262-37A8-401B-8ABD-D0E18E13E5D1}
+		{2BE3E9BE-0536-42F4-8932-827C6C172109} = {2BE3E9BE-0536-42F4-8932-827C6C172109}
+		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tt-badpacket_tests", "tt-badpacket_tests\tt-badpacket_tests.vcproj", "{8AC71185-0619-477C-8C15-0E59D6DEB127}"
+	ProjectSection(ProjectDependencies) = postProject
+		{09471D02-D601-4EFA-B342-0DCFE9082737} = {09471D02-D601-4EFA-B342-0DCFE9082737}
+		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
+		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -455,26 +683,98 @@ Global
 		{9ABB5EB9-7742-4EBE-955A-0AE81B5878BA}.Debug|Win32.Build.0 = Debug|Win32
 		{9ABB5EB9-7742-4EBE-955A-0AE81B5878BA}.Release|Win32.ActiveCfg = Release|Win32
 		{9ABB5EB9-7742-4EBE-955A-0AE81B5878BA}.Release|Win32.Build.0 = Release|Win32
-		{DE8D2C87-5DDF-4A8A-954D-64B21BCB71AE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DE8D2C87-5DDF-4A8A-954D-64B21BCB71AE}.Debug|Win32.Build.0 = Debug|Win32
-		{DE8D2C87-5DDF-4A8A-954D-64B21BCB71AE}.Release|Win32.ActiveCfg = Release|Win32
-		{DE8D2C87-5DDF-4A8A-954D-64B21BCB71AE}.Release|Win32.Build.0 = Release|Win32
 		{E1DCE3BE-46BC-444F-927C-714414FDC457}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E1DCE3BE-46BC-444F-927C-714414FDC457}.Debug|Win32.Build.0 = Debug|Win32
 		{E1DCE3BE-46BC-444F-927C-714414FDC457}.Release|Win32.ActiveCfg = Release|Win32
 		{E1DCE3BE-46BC-444F-927C-714414FDC457}.Release|Win32.Build.0 = Release|Win32
-		{2FEC189D-5EE1-452B-9BE5-EFF8F7B45466}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2FEC189D-5EE1-452B-9BE5-EFF8F7B45466}.Debug|Win32.Build.0 = Debug|Win32
-		{2FEC189D-5EE1-452B-9BE5-EFF8F7B45466}.Release|Win32.ActiveCfg = Release|Win32
-		{2FEC189D-5EE1-452B-9BE5-EFF8F7B45466}.Release|Win32.Build.0 = Release|Win32
-		{6AF54258-C144-4C6B-A10F-DA6D17193B5D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6AF54258-C144-4C6B-A10F-DA6D17193B5D}.Debug|Win32.Build.0 = Debug|Win32
-		{6AF54258-C144-4C6B-A10F-DA6D17193B5D}.Release|Win32.ActiveCfg = Release|Win32
-		{6AF54258-C144-4C6B-A10F-DA6D17193B5D}.Release|Win32.Build.0 = Release|Win32
 		{101C12A4-E84C-4751-A3C6-CB72DE3A4ABC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{101C12A4-E84C-4751-A3C6-CB72DE3A4ABC}.Debug|Win32.Build.0 = Debug|Win32
 		{101C12A4-E84C-4751-A3C6-CB72DE3A4ABC}.Release|Win32.ActiveCfg = Release|Win32
 		{101C12A4-E84C-4751-A3C6-CB72DE3A4ABC}.Release|Win32.Build.0 = Release|Win32
+		{3E487E5C-9AE5-4F08-ACCC-448B0C0BE732}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3E487E5C-9AE5-4F08-ACCC-448B0C0BE732}.Debug|Win32.Build.0 = Debug|Win32
+		{3E487E5C-9AE5-4F08-ACCC-448B0C0BE732}.Release|Win32.ActiveCfg = Release|Win32
+		{3E487E5C-9AE5-4F08-ACCC-448B0C0BE732}.Release|Win32.Build.0 = Release|Win32
+		{D20A3656-A6C5-4838-B20B-0329DE0AB187}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D20A3656-A6C5-4838-B20B-0329DE0AB187}.Debug|Win32.Build.0 = Debug|Win32
+		{D20A3656-A6C5-4838-B20B-0329DE0AB187}.Release|Win32.ActiveCfg = Release|Win32
+		{D20A3656-A6C5-4838-B20B-0329DE0AB187}.Release|Win32.Build.0 = Release|Win32
+		{C5617D33-76BA-4388-AB0E-FC06CFAAA865}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C5617D33-76BA-4388-AB0E-FC06CFAAA865}.Debug|Win32.Build.0 = Debug|Win32
+		{C5617D33-76BA-4388-AB0E-FC06CFAAA865}.Release|Win32.ActiveCfg = Release|Win32
+		{C5617D33-76BA-4388-AB0E-FC06CFAAA865}.Release|Win32.Build.0 = Release|Win32
+		{69A17480-26D6-4E58-A3C4-0EE726E80A7C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{69A17480-26D6-4E58-A3C4-0EE726E80A7C}.Debug|Win32.Build.0 = Debug|Win32
+		{69A17480-26D6-4E58-A3C4-0EE726E80A7C}.Release|Win32.ActiveCfg = Release|Win32
+		{69A17480-26D6-4E58-A3C4-0EE726E80A7C}.Release|Win32.Build.0 = Release|Win32
+		{2E6C27B1-94FA-4C1B-8338-1A650E05B375}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2E6C27B1-94FA-4C1B-8338-1A650E05B375}.Debug|Win32.Build.0 = Debug|Win32
+		{2E6C27B1-94FA-4C1B-8338-1A650E05B375}.Release|Win32.ActiveCfg = Release|Win32
+		{2E6C27B1-94FA-4C1B-8338-1A650E05B375}.Release|Win32.Build.0 = Release|Win32
+		{540ADC90-BF19-4F34-8D44-B415EAEF2338}.Debug|Win32.ActiveCfg = Debug|Win32
+		{540ADC90-BF19-4F34-8D44-B415EAEF2338}.Debug|Win32.Build.0 = Debug|Win32
+		{540ADC90-BF19-4F34-8D44-B415EAEF2338}.Release|Win32.ActiveCfg = Release|Win32
+		{540ADC90-BF19-4F34-8D44-B415EAEF2338}.Release|Win32.Build.0 = Release|Win32
+		{3ADF20CD-D230-4911-8BC6-5D394EF54A95}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3ADF20CD-D230-4911-8BC6-5D394EF54A95}.Debug|Win32.Build.0 = Debug|Win32
+		{3ADF20CD-D230-4911-8BC6-5D394EF54A95}.Release|Win32.ActiveCfg = Release|Win32
+		{3ADF20CD-D230-4911-8BC6-5D394EF54A95}.Release|Win32.Build.0 = Release|Win32
+		{9C6C5E00-5D4F-4149-88A7-AFDCDC7C5017}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9C6C5E00-5D4F-4149-88A7-AFDCDC7C5017}.Debug|Win32.Build.0 = Debug|Win32
+		{9C6C5E00-5D4F-4149-88A7-AFDCDC7C5017}.Release|Win32.ActiveCfg = Release|Win32
+		{9C6C5E00-5D4F-4149-88A7-AFDCDC7C5017}.Release|Win32.Build.0 = Release|Win32
+		{7CFE4391-06F6-4DB2-B631-04BC5D4A40CE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7CFE4391-06F6-4DB2-B631-04BC5D4A40CE}.Debug|Win32.Build.0 = Debug|Win32
+		{7CFE4391-06F6-4DB2-B631-04BC5D4A40CE}.Release|Win32.ActiveCfg = Release|Win32
+		{7CFE4391-06F6-4DB2-B631-04BC5D4A40CE}.Release|Win32.Build.0 = Release|Win32
+		{11EA2746-8E45-4146-86F3-301DEC338E8B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{11EA2746-8E45-4146-86F3-301DEC338E8B}.Debug|Win32.Build.0 = Debug|Win32
+		{11EA2746-8E45-4146-86F3-301DEC338E8B}.Release|Win32.ActiveCfg = Release|Win32
+		{11EA2746-8E45-4146-86F3-301DEC338E8B}.Release|Win32.Build.0 = Release|Win32
+		{C138D564-102E-42AB-947B-C96B0F4A0A1A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C138D564-102E-42AB-947B-C96B0F4A0A1A}.Debug|Win32.Build.0 = Debug|Win32
+		{C138D564-102E-42AB-947B-C96B0F4A0A1A}.Release|Win32.ActiveCfg = Release|Win32
+		{C138D564-102E-42AB-947B-C96B0F4A0A1A}.Release|Win32.Build.0 = Release|Win32
+		{50427469-52BA-4961-80AF-7591198BB1D2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{50427469-52BA-4961-80AF-7591198BB1D2}.Debug|Win32.Build.0 = Debug|Win32
+		{50427469-52BA-4961-80AF-7591198BB1D2}.Release|Win32.ActiveCfg = Release|Win32
+		{50427469-52BA-4961-80AF-7591198BB1D2}.Release|Win32.Build.0 = Release|Win32
+		{B564FA1E-1B2F-42A9-9A2F-F340DC430848}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B564FA1E-1B2F-42A9-9A2F-F340DC430848}.Debug|Win32.Build.0 = Debug|Win32
+		{B564FA1E-1B2F-42A9-9A2F-F340DC430848}.Release|Win32.ActiveCfg = Release|Win32
+		{B564FA1E-1B2F-42A9-9A2F-F340DC430848}.Release|Win32.Build.0 = Release|Win32
+		{B14E334B-B2E5-4A7E-8A55-157BD70ECBE5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B14E334B-B2E5-4A7E-8A55-157BD70ECBE5}.Debug|Win32.Build.0 = Debug|Win32
+		{B14E334B-B2E5-4A7E-8A55-157BD70ECBE5}.Release|Win32.ActiveCfg = Release|Win32
+		{B14E334B-B2E5-4A7E-8A55-157BD70ECBE5}.Release|Win32.Build.0 = Release|Win32
+		{BBF802E6-B6CB-4C58-A0FD-C2DF0F2ADEC2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BBF802E6-B6CB-4C58-A0FD-C2DF0F2ADEC2}.Debug|Win32.Build.0 = Debug|Win32
+		{BBF802E6-B6CB-4C58-A0FD-C2DF0F2ADEC2}.Release|Win32.ActiveCfg = Release|Win32
+		{BBF802E6-B6CB-4C58-A0FD-C2DF0F2ADEC2}.Release|Win32.Build.0 = Release|Win32
+		{2F08DDA1-4175-45E0-92C1-D5919199F543}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2F08DDA1-4175-45E0-92C1-D5919199F543}.Debug|Win32.Build.0 = Debug|Win32
+		{2F08DDA1-4175-45E0-92C1-D5919199F543}.Release|Win32.ActiveCfg = Release|Win32
+		{2F08DDA1-4175-45E0-92C1-D5919199F543}.Release|Win32.Build.0 = Release|Win32
+		{197FDB8D-FAE9-498A-B55B-E009932CD196}.Debug|Win32.ActiveCfg = Debug|Win32
+		{197FDB8D-FAE9-498A-B55B-E009932CD196}.Debug|Win32.Build.0 = Debug|Win32
+		{197FDB8D-FAE9-498A-B55B-E009932CD196}.Release|Win32.ActiveCfg = Release|Win32
+		{197FDB8D-FAE9-498A-B55B-E009932CD196}.Release|Win32.Build.0 = Release|Win32
+		{3D19B634-75D8-4E99-8AF6-032AA67B0353}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3D19B634-75D8-4E99-8AF6-032AA67B0353}.Debug|Win32.Build.0 = Debug|Win32
+		{3D19B634-75D8-4E99-8AF6-032AA67B0353}.Release|Win32.ActiveCfg = Release|Win32
+		{3D19B634-75D8-4E99-8AF6-032AA67B0353}.Release|Win32.Build.0 = Release|Win32
+		{C40A319A-A08A-4482-A68D-2A5754778D7D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C40A319A-A08A-4482-A68D-2A5754778D7D}.Debug|Win32.Build.0 = Debug|Win32
+		{C40A319A-A08A-4482-A68D-2A5754778D7D}.Release|Win32.ActiveCfg = Release|Win32
+		{C40A319A-A08A-4482-A68D-2A5754778D7D}.Release|Win32.Build.0 = Release|Win32
+		{09471D02-D601-4EFA-B342-0DCFE9082737}.Debug|Win32.ActiveCfg = Debug|Win32
+		{09471D02-D601-4EFA-B342-0DCFE9082737}.Debug|Win32.Build.0 = Debug|Win32
+		{09471D02-D601-4EFA-B342-0DCFE9082737}.Release|Win32.ActiveCfg = Release|Win32
+		{09471D02-D601-4EFA-B342-0DCFE9082737}.Release|Win32.Build.0 = Release|Win32
+		{8AC71185-0619-477C-8C15-0E59D6DEB127}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8AC71185-0619-477C-8C15-0E59D6DEB127}.Debug|Win32.Build.0 = Debug|Win32
+		{8AC71185-0619-477C-8C15-0E59D6DEB127}.Release|Win32.ActiveCfg = Release|Win32
+		{8AC71185-0619-477C-8C15-0E59D6DEB127}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/win32build/VS2008/libacl/libacl.vcproj b/win32build/VS2008/libacl/libacl.vcproj
new file mode 100755
index 0000000..49b7eee
--- /dev/null
+++ b/win32build/VS2008/libacl/libacl.vcproj
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="libacl"
+	ProjectGUID="{69A17480-26D6-4E58-A3C4-0EE726E80A7C}"
+	RootNamespace="libacl"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\acl\ip_check.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\acl\loader.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\acl\acl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\acl\check.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\acl\ip_check.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\acl\loader.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\acl\logic_check.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/libacl_tests/libacl_tests.vcproj b/win32build/VS2008/libacl_tests/libacl_tests.vcproj
new file mode 100755
index 0000000..a8ea061
--- /dev/null
+++ b/win32build/VS2008/libacl_tests/libacl_tests.vcproj
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="libacl_tests"
+	ProjectGUID="{540ADC90-BF19-4F34-8D44-B415EAEF2338}"
+	RootNamespace="libacl_tests"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libdns++.lib libcc.lib libacl.lib libdnsacl.lib log4cplusSD.lib gtestd.lib"
+				OutputFile="$(OutDir)\run_unittests.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libacl\$(ConfigurationName)";"..\libdnsacl\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libdns++.lib libcc.lib libacl.lib libdnsacl.lib log4cplusS.lib gtest.lib"
+				OutputFile="$(OutDir)\run_unittests.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libacl\$(ConfigurationName)";"..\libdnsacl\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\acl\tests\acl_test.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\acl\tests\check_test.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\acl\tests\dns_test.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\acl\tests\dnsname_check_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\acl\tests\ip_check_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\acl\tests\loader_test.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\acl\tests\logic_check_test.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\acl\tests\run_unittests.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\acl\tests\creators.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\acl\tests\logcheck.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\acl\tests\sockaddr.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/libasiodns/libasiodns.vcproj b/win32build/VS2008/libasiodns/libasiodns.vcproj
index 405b78f..b279679 100755
--- a/win32build/VS2008/libasiodns/libasiodns.vcproj
+++ b/win32build/VS2008/libasiodns/libasiodns.vcproj
@@ -25,6 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\asiodns&#x0D;&#x0A;..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe asiodns_messages.mes&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -41,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\asiodns;..\..\..\ext\asio;..\..\..\ext\coroutine;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\asiodns;..\..\..\ext\asio;..\..\..\ext\coroutine;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -88,6 +89,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\asiodns&#x0D;&#x0A;..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe asiodns_messages.mes&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -105,7 +107,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\asiodns;..\..\..\ext\asio;..\..\..\ext\coroutine;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\asiodns;..\..\..\ext\asio;..\..\..\ext\coroutine;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -151,7 +153,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\..\src\lib\asiodns\asiodef.cc"
+				RelativePath="..\..\..\src\lib\asiodns\asiodns_messages.cc"
 				>
 			</File>
 			<File
@@ -177,11 +179,11 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\..\..\src\lib\asiodns\asiodef.h"
+				RelativePath="..\..\..\src\lib\asiodns\asiodns.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\lib\asiodns\asiodns.h"
+				RelativePath="..\..\..\src\lib\asiodns\asiodns_messages.h"
 				>
 			</File>
 			<File
diff --git a/win32build/VS2008/libasiodns_tests/libasiodns_tests.vcproj b/win32build/VS2008/libasiodns_tests/libasiodns_tests.vcproj
index 4c6deb8..70be012 100755
--- a/win32build/VS2008/libasiodns_tests/libasiodns_tests.vcproj
+++ b/win32build/VS2008/libasiodns_tests/libasiodns_tests.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\ext\asio;..\..\..\ext\coroutine;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\ext\asio;..\..\..\ext\coroutine;..\..\..\..\gtest\include;"$(BOOST)""
 				PreprocessorDefinitions="TEST_DATA_DIR=\"testdata\""
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -62,10 +62,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib liblog.lib libasiolink.lib libasiodns.lib gtestd.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib libcryptolink.lib liblog.lib libdns++.lib libasiolink.lib libasiodns.lib log4cplusSD.lib botan.lib gtestd.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libexceptions\Debug;..\libutil\Debug;"..\libdns++\Debug";..\liblog\Debug;..\libasiolink\Debug;..\libasiodns\Debug;..\..\..\..\gtest\md9\Debug;"C:\Program Files\boost\boost_1_44\lib""
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libasiodns\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";"$(BOOST)\lib""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -119,7 +119,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\ext\asio;..\..\..\ext\coroutine;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\ext\asio;..\..\..\ext\coroutine;..\..\..\..\gtest\include;"$(BOOST)""
 				PreprocessorDefinitions="TEST_DATA_DIR=\"testdata\""
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -139,10 +139,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib liblog.lib libasiolink.lib libasiodns.lib gtest.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib libcryptolink.lib liblog.lib libdns++.lib libasiolink.lib libasiodns.lib log4cplusS.lib botan.lib gtest.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libexceptions\Release;..\libutil\Release;"..\libdns++\Release";..\liblog\Release;..\libasiolink\Release;..\libasiodns\Release;..\..\..\..\gtest\md9\Release;"C:\Program Files\boost\boost_1_44\lib""
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libasiodns\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";"$(BOOST)\lib""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32build/VS2008/libasiolink/libasiolink.vcproj b/win32build/VS2008/libasiolink/libasiolink.vcproj
index c3c63f1..bf0b28d 100755
--- a/win32build/VS2008/libasiolink/libasiolink.vcproj
+++ b/win32build/VS2008/libasiolink/libasiolink.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;..\..\..\ext\coroutine;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;..\..\..\ext\coroutine;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;..\..\..\ext\coroutine;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;..\..\..\ext\coroutine;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
diff --git a/win32build/VS2008/libasiolink_tests/libasiolink_tests.vcproj b/win32build/VS2008/libasiolink_tests/libasiolink_tests.vcproj
index b666713..346c391 100755
--- a/win32build/VS2008/libasiolink_tests/libasiolink_tests.vcproj
+++ b/win32build/VS2008/libasiolink_tests/libasiolink_tests.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;..\..\..\ext\coroutine;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;..\..\..\ext\coroutine;..\..\..\..\gtest\include;"$(BOOST)""
 				PreprocessorDefinitions="TEST_DATA_DIR=\"testdata\""
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -62,10 +62,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libdns++.lib liblog.lib libasiolink.lib gtestd.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib libdns++.lib liblog.lib libasiolink.lib log4cplusSD.lib gtestd.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libexceptions\Debug;"..\libdns++\Debug";..\liblog\Debug;..\libasiolink\Debug;..\..\..\..\gtest\md9\Debug;"C:\Program Files\boost\boost_1_44\lib""
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";"$(BOOST)\lib""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -119,7 +119,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;..\..\..\ext\coroutine;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;..\..\..\ext\coroutine;..\..\..\..\gtest\include;"$(BOOST)""
 				PreprocessorDefinitions="TEST_DATA_DIR=\"testdata\""
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -139,10 +139,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libdns++.lib liblog.lib libasiolink.lib gtest.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib libdns++.lib liblog.lib libasiolink.lib log4cplusS.lib gtest.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libexceptions\Release;"..\libdns++\Release";..\liblog\Release;..\libasiolink\Release;..\..\..\..\gtest\md9\Release;"C:\Program Files\boost\boost_1_44\lib""
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";"$(BOOST)\lib""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32build/VS2008/libbench/libbench.vcproj b/win32build/VS2008/libbench/libbench.vcproj
index caec83c..25cae05 100755
--- a/win32build/VS2008/libbench/libbench.vcproj
+++ b/win32build/VS2008/libbench/libbench.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
diff --git a/win32build/VS2008/libbench_example/libbench_example.vcproj b/win32build/VS2008/libbench_example/libbench_example.vcproj
index ee0b41b..1d8fe3e 100755
--- a/win32build/VS2008/libbench_example/libbench_example.vcproj
+++ b/win32build/VS2008/libbench_example/libbench_example.vcproj
@@ -65,7 +65,7 @@
 				AdditionalDependencies="libexceptions.lib"
 				OutputFile="$(OutDir)\search_bench.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libexceptions\Debug"
+				AdditionalLibraryDirectories="..\libexceptions\$(ConfigurationName)"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -142,7 +142,7 @@
 				AdditionalDependencies="libexceptions.lib"
 				OutputFile="$(OutDir)\search_bench.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libexceptions\Release"
+				AdditionalLibraryDirectories="..\libexceptions\$(ConfigurationName)"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32build/VS2008/libbench_tests/libbench_tests.vcproj b/win32build/VS2008/libbench_tests/libbench_tests.vcproj
index cf29c3e..569465a 100755
--- a/win32build/VS2008/libbench_tests/libbench_tests.vcproj
+++ b/win32build/VS2008/libbench_tests/libbench_tests.vcproj
@@ -41,8 +41,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
-				PreprocessorDefinitions="TEST_DATA_DIR=\"c:/cygwin/home/fdupont/bind10.trac826/src/lib/bench/tests/testdata\""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="TEST_DATA_DIR=\"$(BIND10HOME)/src/lib/bench/tests/testdata\""
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -62,10 +62,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib libbench.lib gtestd.lib ws2_32.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib libcryptolink.lib libdns++.lib libbench.lib botan.lib gtestd.lib ws2_32.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libexceptions\Debug;..\libutil\Debug;"..\libdns++\Debug";..\libbench\Debug;..\..\..\..\gtest\md9\Debug"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libbench\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -119,8 +119,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
-				PreprocessorDefinitions="TEST_DATA_DIR=\"c:/cygwin/home/fdupont/bind10.trac826/src/lib/bench/tests/testdata\""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="TEST_DATA_DIR=\"$(BIND10HOME)/src/lib/bench/tests/testdata\""
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -139,10 +139,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib libbench.lib gtest.lib ws2_32.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib libcryptolink.lib libdns++.lib libbench.lib botan.lib gtest.lib ws2_32.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libexceptions\Release;..\libutil\Release;"..\libdns++\Release";..\libbench\Release;..\..\..\..\gtest\md9\Release"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libbench\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32build/VS2008/libcache/libcache.vcproj b/win32build/VS2008/libcache/libcache.vcproj
index 59e79f3..8593091 100755
--- a/win32build/VS2008/libcache/libcache.vcproj
+++ b/win32build/VS2008/libcache/libcache.vcproj
@@ -25,6 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\cache&#x0D;&#x0A;..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe cache_messages.mes&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -41,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\nsas;..\..\..\src\lib\cache;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\nsas;..\..\..\src\lib\cache;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -88,6 +89,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\cache&#x0D;&#x0A;..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe cache_messages.mes&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -105,7 +107,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\nsas;..\..\..\src\lib\cache;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\nsas;..\..\..\src\lib\cache;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -155,10 +157,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\cache\cache_messages.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\cache\local_zone_data.cc"
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\cache\logger.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\cache\message_cache.cc"
 				>
 			</File>
@@ -197,10 +207,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\cache\cache_messages.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\cache\local_zone_data.h"
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\cache\logger.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\cache\message_cache.h"
 				>
 			</File>
diff --git a/win32build/VS2008/libcache_tests/libcache_tests.vcproj b/win32build/VS2008/libcache_tests/libcache_tests.vcproj
index ce6fdcb..ed95653 100755
--- a/win32build/VS2008/libcache_tests/libcache_tests.vcproj
+++ b/win32build/VS2008/libcache_tests/libcache_tests.vcproj
@@ -41,8 +41,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\cache;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
-				PreprocessorDefinitions="TEST_DATA_SRCDIR=\"c:/cygwin/home/fdupont/bind10.trac826/src/lib/cache/tests/testdata\";TEST_DATA_BUILDDIR=\"c:/cygwin/home/fdupont/bind10.trac826/src/lib/cache/tests/testdata\""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\cache;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="TEST_DATA_SRCDIR=\"$(BIND10HOME)/src/lib/cache/tests/testdata\";TEST_DATA_BUILDDIR=\"$(BIND10HOME)/src/lib/cache/tests/testdata\""
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -62,10 +62,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib libasiolink.lib libnsas.lib libcache.lib gtestd.lib ws2_32.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libcryptolink.lib libdns++.lib libasiolink.lib libnsas.lib libcache.lib log4cplusSD.lib botan.lib gtestd.lib ws2_32.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libexceptions\Debug;..\libutil\Debug;"..\libdns++\Debug";..\libasiolink\Debug;..\libnsas\Debug;..\libcache\Debug;..\..\..\..\gtest\md9\Debug"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libnsas\$(ConfigurationName)";"..\libcache\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -119,8 +119,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\cache;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
-				PreprocessorDefinitions="TEST_DATA_SRCDIR=\"c:/cygwin/home/fdupont/bind10.trac826/src/lib/cache/tests/testdata\";TEST_DATA_BUILDDIR=\"c:/cygwin/home/fdupont/bind10.trac826/src/lib/cache/tests/testdata\""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\cache;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="TEST_DATA_SRCDIR=\"$(BIND10HOME)/src/lib/cache/tests/testdata\";TEST_DATA_BUILDDIR=\"$(BIND10HOME)/src/lib/cache/tests/testdata\""
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -139,10 +139,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib libasiolink.lib libnsas.lib libcache.lib gtest.lib ws2_32.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libcryptolink.lib libdns++.lib libasiolink.lib libnsas.lib libcache.lib log4cplusS.lib botan.lib gtest.lib ws2_32.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libexceptions\Release;..\libutil\Release;"..\libdns++\Release";..\libasiolink\Release;..\libnsas\Release;..\libcache\Release;..\..\..\..\gtest\md9\Release"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libnsas\$(ConfigurationName)";"..\libcache\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32build/VS2008/libcc/libcc.vcproj b/win32build/VS2008/libcc/libcc.vcproj
index eb2fd2f..4024f7c 100755
--- a/win32build/VS2008/libcc/libcc.vcproj
+++ b/win32build/VS2008/libcc/libcc.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cd ..\..\..\src\lib\cc&#x0D;&#x0A;copy session_config.h.win32 session_config.h&#x0D;&#x0A;"
+				CommandLine="cd ..\..\..\src\lib\cc&#x0D;&#x0A;copy session_config.h.win32 session_config.h&#x0D;&#x0A;..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe cc_messages.mes"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -89,7 +89,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cd ..\..\..\src\lib\cc&#x0D;&#x0A;copy session_config.h.win32 session_config.h&#x0D;&#x0A;"
+				CommandLine="cd ..\..\..\src\lib\cc&#x0D;&#x0A;copy session_config.h.win32 session_config.h&#x0D;&#x0A;..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe cc_messages.mes"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -107,7 +107,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -153,10 +153,18 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
+				RelativePath="..\..\..\src\lib\cc\cc_messages.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\cc\data.cc"
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\cc\logger.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\cc\session.cc"
 				>
 			</File>
@@ -167,10 +175,18 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
+				RelativePath="..\..\..\src\lib\cc\cc_messages.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\cc\data.h"
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\cc\logger.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\cc\session.h"
 				>
 			</File>
diff --git a/win32build/VS2008/libcc_tests/libcc_tests.vcproj b/win32build/VS2008/libcc_tests/libcc_tests.vcproj
index 396683a..2e53d3b 100755
--- a/win32build/VS2008/libcc_tests/libcc_tests.vcproj
+++ b/win32build/VS2008/libcc_tests/libcc_tests.vcproj
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\cc\tests;..\..\..\ext\asio;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\cc\tests;..\..\..\ext\asio;..\..\..\..\gtest\include;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -63,10 +63,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libcc.lib gtestd.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libcc.lib log4cplusSD.lib gtestd.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libexceptions\Debug;..\libcc\Debug;..\..\..\..\gtest\md9\Debug;"C:\Program Files\boost\boost_1_44\lib""
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";"$(BOOST)\lib""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\cc\tests;..\..\..\ext\asio;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\cc\tests;..\..\..\ext\asio;..\..\..\..\gtest\include;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -141,10 +141,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libcc.lib gtest.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libcc.lib log4cplusS.lib gtest.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libexceptions\Release;..\libcc\Release;..\..\..\..\gtest\md9\Release;"C:\Program Files\boost\boost_1_44\lib""
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";"$(BOOST)\lib""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32build/VS2008/libcfgclient/libcfgclient.vcproj b/win32build/VS2008/libcfgclient/libcfgclient.vcproj
index bdc6036..b497b47 100755
--- a/win32build/VS2008/libcfgclient/libcfgclient.vcproj
+++ b/win32build/VS2008/libcfgclient/libcfgclient.vcproj
@@ -25,6 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\config&#x0D;&#x0A;..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe config_messages.mes&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -41,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\cc;..\..\..\src\lib\config;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\cc;..\..\..\src\lib\config;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -88,6 +89,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\config&#x0D;&#x0A;..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe config_messages.mes&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -105,7 +107,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\cc;..\..\..\src\lib\config;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\cc;..\..\..\src\lib\config;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -159,9 +161,21 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\config\config_log.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\config\config_messages.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\config\module_spec.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\..\strptime.cc"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -177,9 +191,21 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\config\config_log.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\config\config_messages.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\config\module_spec.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\strptime.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/win32build/VS2008/libcfgclient_tests/libcfgclient_tests.vcproj b/win32build/VS2008/libcfgclient_tests/libcfgclient_tests.vcproj
index 657e76e..28d36c7 100755
--- a/win32build/VS2008/libcfgclient_tests/libcfgclient_tests.vcproj
+++ b/win32build/VS2008/libcfgclient_tests/libcfgclient_tests.vcproj
@@ -42,8 +42,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
-				PreprocessorDefinitions="TEST_DATA_PATH=\"c:/cygwin/home/fdupont/bind10.trac826/src/lib/config/tests/testdata\""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="TEST_DATA_PATH=\"$(BIND10HOME)/src/lib/config/tests/testdata\";BIND10HOME=\"$(BIND10HOME)\""
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -63,10 +63,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libcc.lib libcfgclient.lib gtestd.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libcc.lib libcfgclient.lib libfake_session.lib log4cplusSD.lib gtestd.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libexceptions\Debug;..\libcc\Debug;..\libcfgclient\Debug;..\..\..\..\gtest\md9\Debug"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libcfgclient\$(ConfigurationName)";"..\libfake_session\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -121,8 +121,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
-				PreprocessorDefinitions="TEST_DATA_PATH=\"c:/cygwin/home/fdupont/bind10.trac826/src/lib/config/tests/testdata\""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="TEST_DATA_PATH=\"$(BIND10HOME)/src/lib/config/tests/testdata\";BIND10HOME=\"$(BIND10HOME)\""
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -141,10 +141,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libcc.lib libcfgclient.lib gtest.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libcc.lib libcfgclient.lib libfake_session.lib log4cplusS.lib gtest.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libexceptions\Release;..\libcc\Release;..\libcfgclient\Release;..\..\..\..\gtest\md9\Release"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libcfgclient\$(ConfigurationName)";"..\libfake_session\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -191,10 +191,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\lib\config\tests\fake_session.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\src\lib\config\tests\module_spec_unittests.cc"
 				>
 			</File>
@@ -212,10 +208,6 @@
 				RelativePath="..\..\..\src\lib\config\tests\data_def_unittests_config.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\lib\config\tests\fake_session.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/win32build/VS2008/libcryptolink/libcryptolink.vcproj b/win32build/VS2008/libcryptolink/libcryptolink.vcproj
index 7b02dc6..12c9bae 100755
--- a/win32build/VS2008/libcryptolink/libcryptolink.vcproj
+++ b/win32build/VS2008/libcryptolink/libcryptolink.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\cryptolink;..\..\..\..\botan\include;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\cryptolink;..\..\..\..\botan\include;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\cryptolink;..\..\..\..\botan\include;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\cryptolink;..\..\..\..\botan\include;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
diff --git a/win32build/VS2008/libcryptolink_tests/libcryptolink_tests.vcproj b/win32build/VS2008/libcryptolink_tests/libcryptolink_tests.vcproj
index 922f8ad..526d8fe 100755
--- a/win32build/VS2008/libcryptolink_tests/libcryptolink_tests.vcproj
+++ b/win32build/VS2008/libcryptolink_tests/libcryptolink_tests.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -62,10 +62,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib libcryptolink.lib gtestd.lib botan.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib libcryptolink.lib gtestd.lib botan.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libexceptions\Debug;..\libutil\Debug;..\libcryptolink\Debug;..\..\..\..\gtest\md9\Debug;..\..\..\..\botan\md9\Debug"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -119,7 +119,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -139,10 +139,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib libcryptolink.lib gtest.lib botan.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib libcryptolink.lib gtest.lib botan.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libexceptions\Release;..\libutil\Release;..\libcryptolink\Release;..\..\..\..\gtest\md9\Release;..\..\..\..\botan\md9\Release"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32build/VS2008/libdatasrc/libdatasrc.vcproj b/win32build/VS2008/libdatasrc/libdatasrc.vcproj
index 71cc567..7a03474 100755
--- a/win32build/VS2008/libdatasrc/libdatasrc.vcproj
+++ b/win32build/VS2008/libdatasrc/libdatasrc.vcproj
@@ -25,6 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\datasrc&#x0D;&#x0A;..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe datasrc_messages.mes&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -41,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;"C:\Program Files\boost\boost_1_44";C:\sqlite3"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;"$(BOOST)";C:\sqlite3"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -88,6 +89,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\datasrc&#x0D;&#x0A;..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe datasrc_messages.mes&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -105,7 +107,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;"C:\Program Files\boost\boost_1_44";C:\sqlite3"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;"$(BOOST)";C:\sqlite3"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -159,6 +161,22 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\datasrc\database.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\datasrc\datasrc_messages.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\datasrc\factory.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\datasrc\logger.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\datasrc\memory_datasrc.cc"
 				>
 			</File>
@@ -167,6 +185,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\datasrc\sqlite3_accessor.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\datasrc\sqlite3_datasrc.cc"
 				>
 			</File>
@@ -189,10 +211,34 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\datasrc\client.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\datasrc\data_source.h"
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\datasrc\database.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\datasrc\datasrc_messages.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\datasrc\factory.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\datasrc\iterator.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\datasrc\logger.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\datasrc\memory_datasrc.h"
 				>
 			</File>
@@ -209,6 +255,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\datasrc\sqlite3_accessor.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\datasrc\sqlite3_datasrc.h"
 				>
 			</File>
diff --git a/win32build/VS2008/libdatasrc_tests/libdatasrc_tests.vcproj b/win32build/VS2008/libdatasrc_tests/libdatasrc_tests.vcproj
index fbf177f..9917151 100755
--- a/win32build/VS2008/libdatasrc_tests/libdatasrc_tests.vcproj
+++ b/win32build/VS2008/libdatasrc_tests/libdatasrc_tests.vcproj
@@ -25,6 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\datasrc\tests\testdata&#x0D;&#x0A;copy rwtest.sqlite3 rwtest.sqlite3.copied&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -41,8 +42,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44";C:\sqlite3"
-				PreprocessorDefinitions="TEST_DATA_DIR=\"c:/cygwin/home/fdupont/bind10.trac826/src/lib/datasrc/tests/testdata\""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\..\gtest\include;"$(BOOST)";C:\sqlite3"
+				PreprocessorDefinitions="TEST_DATA_DIR=\"$(BIND10HOME)/src/lib/datasrc/tests/testdata\";TEST_DATA_BUILDDIR=\"$(BIND10HOME)/src/lib/datasrc/tests/testdata\""
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -62,10 +63,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib libcc.lib libtestutils.lib libdatasrc.lib gtestd.lib sqlite3.lib ws2_32.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libcryptolink.lib libdns++.lib libcc.lib libtestutils.lib libdatasrc.lib log4cplusSD.lib botan.lib gtestd.lib sqlite3.lib ws2_32.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libexceptions\Debug;..\libutil\Debug;"..\libdns++\Debug";..\libcc\Debug;..\libtestutils\Debug;..\libdatasrc\Debug;..\..\..\..\gtest\md9\Debug;C:\sqlite3"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libtestutils\$(ConfigurationName)";"..\libdatasrc\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";C:\sqlite3"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -102,6 +103,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\datasrc\tests\testdata&#x0D;&#x0A;copy rwtest.sqlite3 rwtest.sqlite3.copied&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -119,8 +121,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44";C:\sqlite3"
-				PreprocessorDefinitions="TEST_DATA_DIR=\"c:/cygwin/home/fdupont/bind10.trac826/src/lib/datasrc/tests/testdata\""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\..\gtest\include;"$(BOOST)";C:\sqlite3"
+				PreprocessorDefinitions="TEST_DATA_DIR=\"$(BIND10HOME)/src/lib/datasrc/tests/testdata\";TEST_DATA_BUILDDIR=\"$(BIND10HOME)/src/lib/datasrc/tests/testdata\""
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -139,10 +141,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib libcc.lib libtestutils.lib libdatasrc.lib gtest.lib sqlite3.lib ws2_32.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libcryptolink.lib libdns++.lib libcc.lib libtestutils.lib libdatasrc.lib log4cplusS.lib botan.lib gtest.lib sqlite3.lib ws2_32.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libexceptions\Release;..\libutil\Release;"..\libdns++\Release";..\libcc\Release;..\libtestutils\Release;..\libdatasrc\Release;..\..\..\..\gtest\md9\Release;C:\sqlite3"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libtestutils\$(ConfigurationName)";"..\libdatasrc\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";C:\sqlite3"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -185,10 +187,26 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\datasrc\tests\client_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\datasrc\tests\database_unittest.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\datasrc\tests\datasrc_unittest.cc"
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\datasrc\tests\factory_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\datasrc\tests\logger_unittest.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\datasrc\tests\memory_datasrc_unittest.cc"
 				>
 			</File>
@@ -205,6 +223,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\datasrc\tests\sqlite3_accessor_unittest.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\datasrc\tests\sqlite3_unittest.cc"
 				>
 			</File>
diff --git a/win32build/VS2008/libdhcp/libdhcp.vcproj b/win32build/VS2008/libdhcp/libdhcp.vcproj
new file mode 100755
index 0000000..43add6e
--- /dev/null
+++ b/win32build/VS2008/libdhcp/libdhcp.vcproj
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="libdhcp"
+	ProjectGUID="{3ADF20CD-D230-4911-8BC6-5D394EF54A95}"
+	RootNamespace="libdhcp"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dhcp;..\..\..\ext\asio;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dhcp;..\..\..\ext\asio;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\libdhcp.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\option.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\option6_addrlst.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\option6_ia.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\option6_iaaddr.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\pkt6.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\dhcp6.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\libdhcp.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\option.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\option6_addrlst.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\option6_ia.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\option6_iaaddr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\pkt6.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/libdhcp_tests/libdhcp_tests.vcproj b/win32build/VS2008/libdhcp_tests/libdhcp_tests.vcproj
new file mode 100755
index 0000000..f2562a8
--- /dev/null
+++ b/win32build/VS2008/libdhcp_tests/libdhcp_tests.vcproj
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="libdhcp_tests"
+	ProjectGUID="{9C6C5E00-5D4F-4149-88A7-AFDCDC7C5017}"
+	RootNamespace="libdhcp_tests"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\ext\asio;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libasiolink.lib libdhcp.lib log4cplusSD.lib gtestd.lib"
+				OutputFile="$(OutDir)\run_unittests.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libdhcp\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";"$(BOOST)\lib""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\ext\asio;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libasiolink.lib libdhcp.lib log4cplusS.lib gtest.lib"
+				OutputFile="$(OutDir)\run_unittests.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libdhcp\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";"$(BOOST)\lib""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\tests\libdhcp_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\tests\option6_addrlst_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\tests\option6_ia_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\tests\option6_iaaddr_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\tests\option_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\tests\pkt6_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dhcp\tests\run_unittests.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/libdns++/libdns++.vcproj b/win32build/VS2008/libdns++/libdns++.vcproj
index 0bd869e..c54233c 100755
--- a/win32build/VS2008/libdns++/libdns++.vcproj
+++ b/win32build/VS2008/libdns++/libdns++.vcproj
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\util;..\..\..\src\lib\dns;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\util;..\..\..\src\lib\dns;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -107,7 +107,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\util;..\..\..\src\lib\dns;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\util;..\..\..\src\lib\dns;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -153,6 +153,10 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
+				RelativePath="..\..\..\src\lib\dns\character_string.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\dns\edns.cc"
 				>
 			</File>
@@ -240,6 +244,10 @@
 				RelativePath="..\..\..\src\lib\dns\tsigkey.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\tsigrecord.cc"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -247,6 +255,14 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
+				RelativePath="..\..\..\src\lib\dns\character_string.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\rdata\generic\detail\ds_like.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\dns\edns.h"
 				>
 			</File>
@@ -334,6 +350,14 @@
 				RelativePath="..\..\..\src\lib\dns\tsigkey.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\tsigrecord.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\rdata\generic\detail\txt_like.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/win32build/VS2008/libdns++_benchmarks/libdns++_benchmarks.vcproj b/win32build/VS2008/libdns++_benchmarks/libdns++_benchmarks.vcproj
index 5ac286a..586d8db 100755
--- a/win32build/VS2008/libdns++_benchmarks/libdns++_benchmarks.vcproj
+++ b/win32build/VS2008/libdns++_benchmarks/libdns++_benchmarks.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -64,7 +64,7 @@
 				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib ws2_32.lib"
 				OutputFile="$(OutDir)\rdatarender_bench.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libexceptions\Debug;..\libutil\Debug;"..\libdns++\Debug""
+				AdditionalLibraryDirectories="..\libexceptions\$(ConfigurationName);..\libutil\$(ConfigurationName);"..\libdns++\$(ConfigurationName)""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -118,7 +118,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -140,7 +140,7 @@
 				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib ws2_32.lib"
 				OutputFile="$(OutDir)\rdatarender_bench.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libexceptions\Release;..\libutil\Release;"..\libdns++\Release""
+				AdditionalLibraryDirectories="..\libexceptions\$(ConfigurationName);..\libutil\$(ConfigurationName);"..\libdns++\$(ConfigurationName)""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32build/VS2008/libdns++_python/libdns++_python.vcproj b/win32build/VS2008/libdns++_python/libdns++_python.vcproj
index 541287e..2ea7c7f 100755
--- a/win32build/VS2008/libdns++_python/libdns++_python.vcproj
+++ b/win32build/VS2008/libdns++_python/libdns++_python.vcproj
@@ -20,7 +20,7 @@
 			Name="Debug|Win32"
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
+			ConfigurationType="4"
 			CharacterSet="1"
 			>
 			<Tool
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns\python;"C:\Program Files\boost\boost_1_44";C:\Python32\include"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns\python;"$(BOOST)";C:\Python32\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBDNS_PYTHON_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -61,23 +61,12 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib python32_d.lib ws2_32.lib"
-				OutputFile="$(OutDir)\pydnspp_d.pyd"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libexceptions\Debug;..\libutil\Debug;"..\libdns++\Debug";C:\Python32\libs"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
@@ -87,9 +76,6 @@
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -97,7 +83,7 @@
 			Name="Release|Win32"
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
+			ConfigurationType="4"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
@@ -121,7 +107,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns\python;"C:\Program Files\boost\boost_1_44";C:\Python32\include"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns\python;"$(BOOST)";C:\Python32\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBDNS_PYTHON_EXPORTS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -139,25 +125,12 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib python32.lib ws2_32.lib"
-				OutputFile="$(OutDir)\pydnspp.pyd"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libexceptions\Release;..\libutil\Release;"..\libdns++\Release";C:\Python32\libs"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
@@ -167,9 +140,6 @@
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -183,13 +153,77 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\..\src\lib\dns\python\pydnspp.cc"
+				RelativePath="..\..\..\src\lib\dns\python\edns_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\message_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\messagerenderer_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\name_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\opcode_python.cc"
 				>
 			</File>
 			<File
 				RelativePath="..\..\..\src\lib\dns\python\pydnspp_common.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\question_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\rcode_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\rdata_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\rrclass_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\rrset_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\rrttl_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\rrtype_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\tsig_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\tsig_rdata_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\tsigerror_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\tsigkey_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\tsigrecord_python.cc"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -197,9 +231,81 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
+				RelativePath="..\..\..\src\lib\dns\python\edns_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\message_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\messagerenderer_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\name_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\opcode_python.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\dns\python\pydnspp_common.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\pydnspp_towire.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\question_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\rcode_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\rdata_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\rrclass_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\rrset_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\rrttl_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\rrtype_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\tsig_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\tsig_rdata_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\tsigerror_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\tsigkey_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\tsigrecord_python.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/win32build/VS2008/libdns++_tests/libdns++_tests.vcproj b/win32build/VS2008/libdns++_tests/libdns++_tests.vcproj
index 010e632..891dd42 100755
--- a/win32build/VS2008/libdns++_tests/libdns++_tests.vcproj
+++ b/win32build/VS2008/libdns++_tests/libdns++_tests.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cd ..\..\..\src\lib\dns\tests\testdata&#x0D;&#x0A;copy gen-wiredata.py.win32 gen-wiredata.py&#x0D;&#x0A;python gen-wiredata.py -o edns_toWire1.wire edns_toWire1.spec&#x0D;&#x0A;python gen-wiredata.py -o edns_toWire2.wire edns_toWire2.spec&#x0D;&#x0A;python gen-wiredata.py -o edns_toWire3.wire edns_toWire3.spec&#x0D;&#x0A;python gen-wiredata.py -o edns_toWire4.wire edns_toWire4.spec&#x0D;&#x0A;python gen-wiredata.py -o message_fromWire10.wire message_fromWire10.spec&#x0D;&#x0A;python gen-wiredata.py -o message_fromWire11.wire message_fromWire11.spec&#x0D;&#x0A;python gen-wiredata.py -o name_toWire5.wire name_toWire5.spec&#x0D;&#x0A;python gen-wiredata.py -o name_toWire6.wire name_toWire6.spec&#x0D;&#x0A;python gen-wiredata.py -o rdatafields1.wire rdatafields1.spec&#x0D;&#x0A;python gen-wiredata.py -o rdatafields2.wire rdatafields2.spec&#x0D;&#x0A;python gen-wiredata.py -o rdatafields3.wire rdatafields3.spec&#x0D;&#x0A;python gen-wiredata.py -o rdatafields4.wi
 re rdatafields4.spec&#x0D;&#x0A;python gen-wiredata.py -o rdatafields5.wire rdatafields5.spec&#x0D;&#x0A;python gen-wiredata.py -o rdatafields6.wire rdatafields6.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire10.wire rdata_nsec3_fromWire10.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire11.wire rdata_nsec3_fromWire11.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire12.wire rdata_nsec3_fromWire12.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire13.wire rdata_nsec3_fromWire13.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire14.wire rdata_nsec3_fromWire14.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire15.wire rdata_nsec3_fromWire15.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire1.wire rdata_nsec3_fromWire1.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire2.wire rdata_nsec3_fromWire2.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire4.wire rdata_nsec3_fromWi
 re4.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire5.wire rdata_nsec3_fromWire5.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire6.wire rdata_nsec3_fromWire6.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire7.wire rdata_nsec3_fromWire7.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire8.wire rdata_nsec3_fromWire8.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire9.wire rdata_nsec3_fromWire9.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec_fromWire10.wire rdata_nsec_fromWire10.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec_fromWire4.wire rdata_nsec_fromWire4.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec_fromWire5.wire rdata_nsec_fromWire5.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec_fromWire6.wire rdata_nsec_fromWire6.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec_fromWire7.wire rdata_nsec_fromWire7.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec_fromWire8.wire rdata_nsec_from
 Wire8.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec_fromWire9.wire rdata_nsec_fromWire9.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_rp_fromWire1.wire rdata_rp_fromWire1.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_rp_fromWire2.wire rdata_rp_fromWire2.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_rp_fromWire3.wire rdata_rp_fromWire3.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_rp_fromWire4.wire rdata_rp_fromWire4.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_rp_fromWire5.wire rdata_rp_fromWire5.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_rp_fromWire6.wire rdata_rp_fromWire6.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_rp_toWire1.wire rdata_rp_toWire1.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_rp_toWire2.wire rdata_rp_toWire2.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_rrsig_fromWire2.wire rdata_rrsig_fromWire2.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_soa_toWireUncompressed.wire rdata_soa_toWireUncompressed.spec&#x0D;&#x0A;python gen
 -wiredata.py -o rdata_tsig_fromWire1.wire rdata_tsig_fromWire1.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_fromWire2.wire rdata_tsig_fromWire2.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_fromWire3.wire rdata_tsig_fromWire3.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_fromWire4.wire rdata_tsig_fromWire4.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_fromWire5.wire rdata_tsig_fromWire5.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_fromWire6.wire rdata_tsig_fromWire6.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_fromWire7.wire rdata_tsig_fromWire7.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_fromWire8.wire rdata_tsig_fromWire8.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_fromWire9.wire rdata_tsig_fromWire9.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_toWire1.wire rdata_tsig_toWire1.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_toWire2.wire rdata_tsig_toWire2.spec&#x0D;&#x0A;python gen-wiredata.py -o rd
 ata_tsig_toWire3.wire rdata_tsig_toWire3.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_toWire4.wire rdata_tsig_toWire4.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_toWire5.wire rdata_tsig_toWire5.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_txt_fromWire2.wire rdata_txt_fromWire2.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_txt_fromWire3.wire rdata_txt_fromWire3.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_txt_fromWire4.wire rdata_txt_fromWire4.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_txt_fromWire5.wire rdata_txt_fromWire5.spec&#x0D;&#x0A;"
+				CommandLine="cd ..\..\..\src\lib\dns\tests\testdata&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o edns_toWire1.wire edns_toWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o edns_toWire2.wire edns_toWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o edns_toWire3.wire edns_toWire3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o edns_toWire4.wire edns_toWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire10.wire message_fromWire10.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire11.wire message_fromWire11.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire12.wire message_fromWire12.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire13.wire message_fromWire13.spec&#x0D;&#x0A;python $(BIND10HOM
 E)/src/lib/util/python/gen_wiredata.py -o message_fromWire14.wire message_fromWire14.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire15.wire message_fromWire15.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire16.wire message_fromWire16.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire17.wire message_fromWire17.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire18.wire message_fromWire18.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire19.wire message_fromWire19.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire20.wire message_fromWire20.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire21.wire message_fromWire21.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.p
 y -o message_fromWire22.wire message_fromWire22.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_toText1.wire message_toText1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_toText2.wire message_toText2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_toText3.wire message_toText3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_toWire2.wire message_toWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_toWire3.wire message_toWire3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_toWire4.wire message_toWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_toWire5.wire message_toWire5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o name_toWire5.wire name_toWire5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/li
 b/util/python/gen_wiredata.py -o name_toWire6.wire name_toWire6.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire1.wire rdata_afsdb_fromWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire2.wire rdata_afsdb_fromWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire3.wire rdata_afsdb_fromWire3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire4.wire rdata_afsdb_fromWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire5.wire rdata_afsdb_fromWire5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_toWire1.wire rdata_afsdb_toWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_toWire2.wire rdata_afsdb_toWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/g
 en_wiredata.py -o rdatafields1.wire rdatafields1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdatafields2.wire rdatafields2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdatafields3.wire rdatafields3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdatafields4.wire rdatafields4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdatafields5.wire rdatafields5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdatafields6.wire rdatafields6.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire1.wire rdata_minfo_fromWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire2.wire rdata_minfo_fromWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire3.wire rdata_minfo_fromWire3.spec&#x0D;&#x0A;python $(BIND1
 0HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire4.wire rdata_minfo_fromWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire5.wire rdata_minfo_fromWire5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire6.wire rdata_minfo_fromWire6.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_toWire1.wire rdata_minfo_toWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_toWire2.wire rdata_minfo_toWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_toWireUncompressed1.wire rdata_minfo_toWireUncompressed1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_toWireUncompressed2.wire rdata_minfo_toWireUncompressed2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire10.wire rdata_ns
 ec3_fromWire10.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire11.wire rdata_nsec3_fromWire11.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire12.wire rdata_nsec3_fromWire12.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire13.wire rdata_nsec3_fromWire13.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire14.wire rdata_nsec3_fromWire14.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire15.wire rdata_nsec3_fromWire15.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire1.wire rdata_nsec3_fromWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire2.wire rdata_nsec3_fromWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_f
 romWire4.wire rdata_nsec3_fromWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire5.wire rdata_nsec3_fromWire5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire6.wire rdata_nsec3_fromWire6.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire7.wire rdata_nsec3_fromWire7.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire8.wire rdata_nsec3_fromWire8.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire9.wire rdata_nsec3_fromWire9.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire10.wire rdata_nsec_fromWire10.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire4.wire rdata_nsec_fromWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdat
 a_nsec_fromWire5.wire rdata_nsec_fromWire5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire6.wire rdata_nsec_fromWire6.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire7.wire rdata_nsec_fromWire7.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire8.wire rdata_nsec_fromWire8.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire9.wire rdata_nsec_fromWire9.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire1.wire rdata_rp_fromWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire2.wire rdata_rp_fromWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire3.wire rdata_rp_fromWire3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire4.wi
 re rdata_rp_fromWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire5.wire rdata_rp_fromWire5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire6.wire rdata_rp_fromWire6.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_rp_toWire1.wire rdata_rp_toWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_rp_toWire2.wire rdata_rp_toWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_rrsig_fromWire2.wire rdata_rrsig_fromWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_soa_toWireUncompressed.wire rdata_soa_toWireUncompressed.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire1.wire rdata_tsig_fromWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire2.wire rdata_tsig
 _fromWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire3.wire rdata_tsig_fromWire3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire4.wire rdata_tsig_fromWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire5.wire rdata_tsig_fromWire5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire6.wire rdata_tsig_fromWire6.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire7.wire rdata_tsig_fromWire7.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire8.wire rdata_tsig_fromWire8.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire9.wire rdata_tsig_fromWire9.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire1.wire rdata_tsig_toWire
 1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire2.wire rdata_tsig_toWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire3.wire rdata_tsig_toWire3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire4.wire rdata_tsig_toWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire5.wire rdata_tsig_toWire5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_txt_fromWire2.wire rdata_txt_fromWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_txt_fromWire3.wire rdata_txt_fromWire3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_txt_fromWire4.wire rdata_txt_fromWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_txt_fromWire5.wire rdata_txt_fromWire5.spec&#x0D;&#x0A;python $(BI
 ND10HOME)/src/lib/util/python/gen_wiredata.py -o tsigrecord_toWire1.wire tsigrecord_toWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsigrecord_toWire2.wire tsigrecord_toWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify10.wire tsig_verify10.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify1.wire tsig_verify1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify2.wire tsig_verify2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify3.wire tsig_verify3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify4.wire tsig_verify4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify5.wire tsig_verify5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify6.wire tsig_verify6.spec&#x0D;&#x0A;python $(BI
 ND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify7.wire tsig_verify7.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify8.wire tsig_verify8.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify9.wire tsig_verify9.spec&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -42,8 +42,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\util;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
-				PreprocessorDefinitions="TEST_DATA_SRCDIR=\"c:/cygwin/home/fdupont/bind10.trac826/src/lib/dns/tests/testdata\";TEST_DATA_BUILDDIR=\"c:/cygwin/home/fdupont/bind10.trac826/src/lib/dns/tests/testdata\""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\util;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="TEST_DATA_SRCDIR=\"$(BIND10HOME)/src/lib/dns/tests/testdata\";TEST_DATA_BUILDDIR=\"$(BIND10HOME)/src/lib/dns/tests/testdata\""
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -66,7 +66,7 @@
 				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib libcryptolink.lib libdns++.lib gtestd.lib botan.lib ws2_32.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libexceptions\Debug;..\libutil\Debug;..\libutil_unittests\Debug;..\libcryptolink\Debug;"..\libdns++\Debug";..\..\..\..\gtest\md9\Debug;..\..\..\..\botan\md9\Debug"
+				AdditionalLibraryDirectories="..\libexceptions\$(ConfigurationName);..\libutil\$(ConfigurationName);..\libutil_unittests\$(ConfigurationName);..\libcryptolink\$(ConfigurationName);"..\libdns++\$(ConfigurationName)";..\..\..\..\gtest\md9\$(ConfigurationName);..\..\..\..\botan\md9\$(ConfigurationName)"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -103,7 +103,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cd ..\..\..\src\lib\dns\tests\testdata&#x0D;&#x0A;copy gen-wiredata.py.win32 gen-wiredata.py&#x0D;&#x0A;python gen-wiredata.py -o edns_toWire1.wire edns_toWire1.spec&#x0D;&#x0A;python gen-wiredata.py -o edns_toWire2.wire edns_toWire2.spec&#x0D;&#x0A;python gen-wiredata.py -o edns_toWire3.wire edns_toWire3.spec&#x0D;&#x0A;python gen-wiredata.py -o edns_toWire4.wire edns_toWire4.spec&#x0D;&#x0A;python gen-wiredata.py -o message_fromWire10.wire message_fromWire10.spec&#x0D;&#x0A;python gen-wiredata.py -o message_fromWire11.wire message_fromWire11.spec&#x0D;&#x0A;python gen-wiredata.py -o name_toWire5.wire name_toWire5.spec&#x0D;&#x0A;python gen-wiredata.py -o name_toWire6.wire name_toWire6.spec&#x0D;&#x0A;python gen-wiredata.py -o rdatafields1.wire rdatafields1.spec&#x0D;&#x0A;python gen-wiredata.py -o rdatafields2.wire rdatafields2.spec&#x0D;&#x0A;python gen-wiredata.py -o rdatafields3.wire rdatafields3.spec&#x0D;&#x0A;python gen-wiredata.py -o rdatafields4.wi
 re rdatafields4.spec&#x0D;&#x0A;python gen-wiredata.py -o rdatafields5.wire rdatafields5.spec&#x0D;&#x0A;python gen-wiredata.py -o rdatafields6.wire rdatafields6.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire10.wire rdata_nsec3_fromWire10.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire11.wire rdata_nsec3_fromWire11.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire12.wire rdata_nsec3_fromWire12.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire13.wire rdata_nsec3_fromWire13.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire14.wire rdata_nsec3_fromWire14.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire15.wire rdata_nsec3_fromWire15.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire1.wire rdata_nsec3_fromWire1.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire2.wire rdata_nsec3_fromWire2.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire4.wire rdata_nsec3_fromWi
 re4.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire5.wire rdata_nsec3_fromWire5.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire6.wire rdata_nsec3_fromWire6.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire7.wire rdata_nsec3_fromWire7.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire8.wire rdata_nsec3_fromWire8.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec3_fromWire9.wire rdata_nsec3_fromWire9.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec_fromWire10.wire rdata_nsec_fromWire10.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec_fromWire4.wire rdata_nsec_fromWire4.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec_fromWire5.wire rdata_nsec_fromWire5.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec_fromWire6.wire rdata_nsec_fromWire6.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec_fromWire7.wire rdata_nsec_fromWire7.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec_fromWire8.wire rdata_nsec_from
 Wire8.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_nsec_fromWire9.wire rdata_nsec_fromWire9.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_rp_fromWire1.wire rdata_rp_fromWire1.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_rp_fromWire2.wire rdata_rp_fromWire2.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_rp_fromWire3.wire rdata_rp_fromWire3.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_rp_fromWire4.wire rdata_rp_fromWire4.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_rp_fromWire5.wire rdata_rp_fromWire5.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_rp_fromWire6.wire rdata_rp_fromWire6.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_rp_toWire1.wire rdata_rp_toWire1.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_rp_toWire2.wire rdata_rp_toWire2.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_rrsig_fromWire2.wire rdata_rrsig_fromWire2.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_soa_toWireUncompressed.wire rdata_soa_toWireUncompressed.spec&#x0D;&#x0A;python gen
 -wiredata.py -o rdata_tsig_fromWire1.wire rdata_tsig_fromWire1.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_fromWire2.wire rdata_tsig_fromWire2.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_fromWire3.wire rdata_tsig_fromWire3.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_fromWire4.wire rdata_tsig_fromWire4.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_fromWire5.wire rdata_tsig_fromWire5.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_fromWire6.wire rdata_tsig_fromWire6.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_fromWire7.wire rdata_tsig_fromWire7.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_fromWire8.wire rdata_tsig_fromWire8.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_fromWire9.wire rdata_tsig_fromWire9.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_toWire1.wire rdata_tsig_toWire1.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_toWire2.wire rdata_tsig_toWire2.spec&#x0D;&#x0A;python gen-wiredata.py -o rd
 ata_tsig_toWire3.wire rdata_tsig_toWire3.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_toWire4.wire rdata_tsig_toWire4.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_tsig_toWire5.wire rdata_tsig_toWire5.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_txt_fromWire2.wire rdata_txt_fromWire2.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_txt_fromWire3.wire rdata_txt_fromWire3.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_txt_fromWire4.wire rdata_txt_fromWire4.spec&#x0D;&#x0A;python gen-wiredata.py -o rdata_txt_fromWire5.wire rdata_txt_fromWire5.spec&#x0D;&#x0A;"
+				CommandLine="cd ..\..\..\src\lib\dns\tests\testdata&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o edns_toWire1.wire edns_toWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o edns_toWire2.wire edns_toWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o edns_toWire3.wire edns_toWire3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o edns_toWire4.wire edns_toWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire10.wire message_fromWire10.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire11.wire message_fromWire11.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire12.wire message_fromWire12.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire13.wire message_fromWire13.spec&#x0D;&#x0A;python $(BIND10HOM
 E)/src/lib/util/python/gen_wiredata.py -o message_fromWire14.wire message_fromWire14.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire15.wire message_fromWire15.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire16.wire message_fromWire16.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire17.wire message_fromWire17.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire18.wire message_fromWire18.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire19.wire message_fromWire19.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire20.wire message_fromWire20.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_fromWire21.wire message_fromWire21.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.p
 y -o message_fromWire22.wire message_fromWire22.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_toText1.wire message_toText1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_toText2.wire message_toText2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_toText3.wire message_toText3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_toWire2.wire message_toWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_toWire3.wire message_toWire3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_toWire4.wire message_toWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o message_toWire5.wire message_toWire5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o name_toWire5.wire name_toWire5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/li
 b/util/python/gen_wiredata.py -o name_toWire6.wire name_toWire6.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire1.wire rdata_afsdb_fromWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire2.wire rdata_afsdb_fromWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire3.wire rdata_afsdb_fromWire3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire4.wire rdata_afsdb_fromWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire5.wire rdata_afsdb_fromWire5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_toWire1.wire rdata_afsdb_toWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_toWire2.wire rdata_afsdb_toWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/g
 en_wiredata.py -o rdatafields1.wire rdatafields1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdatafields2.wire rdatafields2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdatafields3.wire rdatafields3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdatafields4.wire rdatafields4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdatafields5.wire rdatafields5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdatafields6.wire rdatafields6.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire1.wire rdata_minfo_fromWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire2.wire rdata_minfo_fromWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire3.wire rdata_minfo_fromWire3.spec&#x0D;&#x0A;python $(BIND1
 0HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire4.wire rdata_minfo_fromWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire5.wire rdata_minfo_fromWire5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire6.wire rdata_minfo_fromWire6.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_toWire1.wire rdata_minfo_toWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_toWire2.wire rdata_minfo_toWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_toWireUncompressed1.wire rdata_minfo_toWireUncompressed1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_minfo_toWireUncompressed2.wire rdata_minfo_toWireUncompressed2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire10.wire rdata_ns
 ec3_fromWire10.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire11.wire rdata_nsec3_fromWire11.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire12.wire rdata_nsec3_fromWire12.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire13.wire rdata_nsec3_fromWire13.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire14.wire rdata_nsec3_fromWire14.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire15.wire rdata_nsec3_fromWire15.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire1.wire rdata_nsec3_fromWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire2.wire rdata_nsec3_fromWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_f
 romWire4.wire rdata_nsec3_fromWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire5.wire rdata_nsec3_fromWire5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire6.wire rdata_nsec3_fromWire6.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire7.wire rdata_nsec3_fromWire7.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire8.wire rdata_nsec3_fromWire8.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire9.wire rdata_nsec3_fromWire9.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire10.wire rdata_nsec_fromWire10.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire4.wire rdata_nsec_fromWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdat
 a_nsec_fromWire5.wire rdata_nsec_fromWire5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire6.wire rdata_nsec_fromWire6.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire7.wire rdata_nsec_fromWire7.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire8.wire rdata_nsec_fromWire8.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire9.wire rdata_nsec_fromWire9.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire1.wire rdata_rp_fromWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire2.wire rdata_rp_fromWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire3.wire rdata_rp_fromWire3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire4.wi
 re rdata_rp_fromWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire5.wire rdata_rp_fromWire5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire6.wire rdata_rp_fromWire6.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_rp_toWire1.wire rdata_rp_toWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_rp_toWire2.wire rdata_rp_toWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_rrsig_fromWire2.wire rdata_rrsig_fromWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_soa_toWireUncompressed.wire rdata_soa_toWireUncompressed.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire1.wire rdata_tsig_fromWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire2.wire rdata_tsig
 _fromWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire3.wire rdata_tsig_fromWire3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire4.wire rdata_tsig_fromWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire5.wire rdata_tsig_fromWire5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire6.wire rdata_tsig_fromWire6.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire7.wire rdata_tsig_fromWire7.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire8.wire rdata_tsig_fromWire8.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire9.wire rdata_tsig_fromWire9.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire1.wire rdata_tsig_toWire
 1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire2.wire rdata_tsig_toWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire3.wire rdata_tsig_toWire3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire4.wire rdata_tsig_toWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire5.wire rdata_tsig_toWire5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_txt_fromWire2.wire rdata_txt_fromWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_txt_fromWire3.wire rdata_txt_fromWire3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_txt_fromWire4.wire rdata_txt_fromWire4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o rdata_txt_fromWire5.wire rdata_txt_fromWire5.spec&#x0D;&#x0A;python $(BI
 ND10HOME)/src/lib/util/python/gen_wiredata.py -o tsigrecord_toWire1.wire tsigrecord_toWire1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsigrecord_toWire2.wire tsigrecord_toWire2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify10.wire tsig_verify10.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify1.wire tsig_verify1.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify2.wire tsig_verify2.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify3.wire tsig_verify3.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify4.wire tsig_verify4.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify5.wire tsig_verify5.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify6.wire tsig_verify6.spec&#x0D;&#x0A;python $(BI
 ND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify7.wire tsig_verify7.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify8.wire tsig_verify8.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o tsig_verify9.wire tsig_verify9.spec&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -121,8 +121,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\util;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
-				PreprocessorDefinitions="TEST_DATA_SRCDIR=\"c:/cygwin/home/fdupont/bind10.trac826/src/lib/dns/tests/testdata\";TEST_DATA_BUILDDIR=\"c:/cygwin/home/fdupont/bind10.trac826/src/lib/dns/tests/testdata\""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\util;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="TEST_DATA_SRCDIR=\"$(BIND10HOME)/src/lib/dns/tests/testdata\";TEST_DATA_BUILDDIR=\"$(BIND10HOME)/src/lib/dns/tests/testdata\""
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -144,7 +144,7 @@
 				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib libcryptolink.lib libdns++.lib gtest.lib botan.lib ws2_32.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libexceptions\Release;..\libutil\Release;..\libutil_unittests\Release;..\libcryptolink\Release;"..\libdns++\Release";..\..\..\..\gtest\md9\Release;..\..\..\..\botan\md9\Release"
+				AdditionalLibraryDirectories="..\libexceptions\$(ConfigurationName);..\libutil\$(ConfigurationName);..\libutil_unittests\$(ConfigurationName);..\libcryptolink\$(ConfigurationName);"..\libdns++\$(ConfigurationName)";..\..\..\..\gtest\md9\$(ConfigurationName);..\..\..\..\botan\md9\$(ConfigurationName)"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -183,6 +183,10 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
+				RelativePath="..\..\..\src\lib\dns\tests\character_string_unittest.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\dns\tests\edns_unittest.cc"
 				>
 			</File>
@@ -215,10 +219,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\dns\tests\rdata_afsdb_unittest.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\dns\tests\rdata_cname_unittest.cc"
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\dns\tests\rdata_dhcid_unittest.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\dns\tests\rdata_dname_unittest.cc"
 				>
 			</File>
@@ -227,7 +239,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\lib\dns\tests\rdata_ds_unittest.cc"
+				RelativePath="..\..\..\src\lib\dns\tests\rdata_ds_like_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\dns\tests\rdata_hinfo_unittest.cc"
 				>
 			</File>
 			<File
@@ -239,10 +255,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\dns\tests\rdata_minfo_unittest.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\dns\tests\rdata_mx_unittest.cc"
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\dns\tests\rdata_naptr_unittest.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\dns\tests\rdata_ns_unittest.cc"
 				>
 			</File>
@@ -283,11 +307,15 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\dns\tests\rdata_srv_unittest.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\dns\tests\rdata_tsig_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\lib\dns\tests\rdata_txt_unittest.cc"
+				RelativePath="..\..\..\src\lib\dns\tests\rdata_txt_like_unittest.cc"
 				>
 			</File>
 			<File
@@ -339,6 +367,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\dns\tests\tsigrecord_unittest.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\dns\tests\unittest_util.cc"
 				>
 			</File>
diff --git a/win32build/VS2008/libdnsacl/libdnsacl.vcproj b/win32build/VS2008/libdnsacl/libdnsacl.vcproj
new file mode 100755
index 0000000..5707557
--- /dev/null
+++ b/win32build/VS2008/libdnsacl/libdnsacl.vcproj
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="libdnsacl"
+	ProjectGUID="{2E6C27B1-94FA-4C1B-8338-1A650E05B375}"
+	RootNamespace="libdnsacl"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\acl\dns.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\acl\dns.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\acl\dnsname_check.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/libexceptions_tests/libexceptions_tests.vcproj b/win32build/VS2008/libexceptions_tests/libexceptions_tests.vcproj
index 61a646e..31a13af 100755
--- a/win32build/VS2008/libexceptions_tests/libexceptions_tests.vcproj
+++ b/win32build/VS2008/libexceptions_tests/libexceptions_tests.vcproj
@@ -65,7 +65,7 @@
 				AdditionalDependencies="libexceptions.lib gtestd.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libexceptions\Debug;..\..\..\..\gtest\md9\Debug"
+				AdditionalLibraryDirectories="..\libexceptions\$(ConfigurationName);..\..\..\..\gtest\md9\$(ConfigurationName)"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -142,7 +142,7 @@
 				AdditionalDependencies="libexceptions.lib gtest.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libexceptions\Release;..\..\..\..\gtest\md9\Release"
+				AdditionalLibraryDirectories="..\libexceptions\$(ConfigurationName);..\..\..\..\gtest\md9\$(ConfigurationName)"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32build/VS2008/libfake_session/libfake_session.vcproj b/win32build/VS2008/libfake_session/libfake_session.vcproj
new file mode 100755
index 0000000..eafd6ea
--- /dev/null
+++ b/win32build/VS2008/libfake_session/libfake_session.vcproj
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="libfake_session"
+	ProjectGUID="{3E487E5C-9AE5-4F08-ACCC-448B0C0BE732}"
+	RootNamespace="libfake_session"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\config\tests\fake_session.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\config\tests\fake_session.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/liblog/liblog.vcproj b/win32build/VS2008/liblog/liblog.vcproj
index bb1abe4..393e9e6 100755
--- a/win32build/VS2008/liblog/liblog.vcproj
+++ b/win32build/VS2008/liblog/liblog.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\log;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\log;..\..\..\..\log4cplus\include;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\log;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\log;..\..\..\..\log4cplus\include;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -155,6 +155,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\log\log_formatter.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\log_messages.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\log\logger.cc"
 				>
 			</File>
@@ -163,31 +171,51 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\log\logger_level.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\logger_level_impl.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\logger_manager.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\logger_manager_impl.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\logger_name.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\log\logger_support.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\lib\log\message_dictionary.cc"
+				RelativePath="..\..\..\src\lib\log\logger_unittest_support.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\lib\log\message_exception.cc"
+				RelativePath="..\..\..\src\lib\log\logimpl_messages.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\lib\log\message_initializer.cc"
+				RelativePath="..\..\..\src\lib\log\message_dictionary.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\lib\log\message_reader.cc"
+				RelativePath="..\..\..\src\lib\log\message_initializer.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\lib\log\messagedef.cc"
+				RelativePath="..\..\..\src\lib\log\message_reader.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\lib\log\root_logger_name.cc"
+				RelativePath="..\..\..\src\lib\log\output_option.cc"
 				>
 			</File>
 		</Filter>
@@ -197,11 +225,15 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\..\..\src\lib\log\debug_levels.h"
+				RelativePath="..\..\..\src\lib\log\dummylog.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\lib\log\dummylog.h"
+				RelativePath="..\..\..\src\lib\log\log_formatter.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\log_messages.h"
 				>
 			</File>
 			<File
@@ -213,7 +245,27 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\lib\log\logger_levels.h"
+				RelativePath="..\..\..\src\lib\log\logger_level.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\logger_level_impl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\logger_manager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\logger_manager_impl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\logger_name.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\logger_specification.h"
 				>
 			</File>
 			<File
@@ -221,6 +273,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\log\logger_unittest_support.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\logimpl_messages.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\macros.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\log\message_dictionary.h"
 				>
 			</File>
@@ -241,11 +305,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\lib\log\messagedef.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\lib\log\root_logger_name.h"
+				RelativePath="..\..\..\src\lib\log\output_option.h"
 				>
 			</File>
 		</Filter>
diff --git a/win32build/VS2008/liblog_compiler/liblog_compiler.vcproj b/win32build/VS2008/liblog_compiler/liblog_compiler.vcproj
index a93431f..8db3682 100755
--- a/win32build/VS2008/liblog_compiler/liblog_compiler.vcproj
+++ b/win32build/VS2008/liblog_compiler/liblog_compiler.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\log;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\log;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -62,10 +62,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libutil.lib liblog.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib liblog.lib"
 				OutputFile="$(OutDir)\message.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libutil\Debug;..\liblog\Debug"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\liblog\$(ConfigurationName)""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -119,7 +119,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\log;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\log;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -139,10 +139,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libutil.lib liblog.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib liblog.lib"
 				OutputFile="$(OutDir)\message.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libutil\Release;..\liblog\Release"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\liblog\$(ConfigurationName)""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32build/VS2008/liblog_example/liblog_example.vcproj b/win32build/VS2008/liblog_example/liblog_example.vcproj
new file mode 100755
index 0000000..ab932f8
--- /dev/null
+++ b/win32build/VS2008/liblog_example/liblog_example.vcproj
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="liblog_example"
+	ProjectGUID="{7CFE4391-06F6-4DB2-B631-04BC5D4A40CE}"
+	RootNamespace="liblog_example"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib liblog.lib log4cplusSD.lib"
+				OutputFile="$(OutDir)\logger_example.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\log\tests&#x0D;&#x0A;copy console_test.sh.win32 console_test.sh&#x0D;&#x0A;copy destination_test.sh.win32 destination_test.sh&#x0D;&#x0A;copy local_file_test.sh.win32 local_file_test.sh&#x0D;&#x0A;copy severity_test.sh.win32 severity_test.sh&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib liblog.lib log4cplusS.lib"
+				OutputFile="$(OutDir)\logger_example.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\log\tests&#x0D;&#x0A;copy console_test.sh.win32 console_test.sh&#x0D;&#x0A;copy destination_test.sh.win32 destination_test.sh&#x0D;&#x0A;copy local_file_test.sh.win32 local_file_test.sh&#x0D;&#x0A;copy severity_test.sh.win32 severity_test.sh&#x0D;&#x0A;"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\getopt.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\tests\logger_example.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\getopt.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/liblog_iltest/liblog_iltest.vcproj b/win32build/VS2008/liblog_iltest/liblog_iltest.vcproj
new file mode 100755
index 0000000..cf29815
--- /dev/null
+++ b/win32build/VS2008/liblog_iltest/liblog_iltest.vcproj
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="liblog_iltest"
+	ProjectGUID="{11EA2746-8E45-4146-86F3-301DEC338E8B}"
+	RootNamespace="liblog_iltest"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..;..\..\..\src\lib;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib liblog.lib log4cplusSD.lib"
+				OutputFile="$(OutDir)\init_logger_test.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\log\tests&#x0D;&#x0A;copy init_logger_test.sh.win32 init_logger_test.sh&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..;..\..\..\src\lib;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib liblog.lib log4cplusS.lib"
+				OutputFile="$(OutDir)\init_logger_test.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\log\tests&#x0D;&#x0A;copy init_logger_test.sh.win32 init_logger_test.sh&#x0D;&#x0A;"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\log\tests\init_logger_test.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/liblog_rtitest/liblog_rtitest.vcproj b/win32build/VS2008/liblog_rtitest/liblog_rtitest.vcproj
index 7047073..1465dc5 100755
--- a/win32build/VS2008/liblog_rtitest/liblog_rtitest.vcproj
+++ b/win32build/VS2008/liblog_rtitest/liblog_rtitest.vcproj
@@ -65,7 +65,7 @@
 				AdditionalDependencies="libutil.lib liblog.lib"
 				OutputFile="$(OutDir)\logger_support_test.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libutil\Debug;..\liblog\Debug"
+				AdditionalLibraryDirectories="..\libutil\$(ConfigurationName);..\liblog\$(ConfigurationName)"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -143,7 +143,7 @@
 				AdditionalDependencies="libutil.lib liblog.lib"
 				OutputFile="$(OutDir)\logger_support_test.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libutil\Release;..\liblog\Release"
+				AdditionalLibraryDirectories="..\libutil\$(ConfigurationName);..\liblog\$(ConfigurationName)"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32build/VS2008/liblog_tests/liblog_tests.vcproj b/win32build/VS2008/liblog_tests/liblog_tests.vcproj
index 83c4232..a8380dd 100755
--- a/win32build/VS2008/liblog_tests/liblog_tests.vcproj
+++ b/win32build/VS2008/liblog_tests/liblog_tests.vcproj
@@ -25,6 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\log\tests&#x0D;&#x0A;copy tempdir.h.win32 tempdir.h&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -41,8 +42,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\log;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\log;..\..\..\..\log4cplus\include;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="BIND10HOME=\"$(BIND10HOME)\""
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -62,10 +63,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libutil.lib liblog.lib gtestd.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib log4cplusSD.lib gtestd.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libutil\Debug;..\liblog\Debug;..\..\..\..\gtest\md9\Debug"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -102,6 +103,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\log\tests&#x0D;&#x0A;copy tempdir.h.win32 tempdir.h&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -119,8 +121,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\log;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\log;..\..\..\..\log4cplus\include;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="BIND10HOME=\"$(BIND10HOME)\""
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -139,10 +141,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libutil.lib liblog.lib gtest.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib log4cplusS.lib gtest.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libutil\Release;..\liblog\Release;..\..\..\..\gtest\md9\Release"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -181,6 +183,34 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
+				RelativePath="..\..\..\src\lib\log\tests\log_formatter_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\tests\logger_level_impl_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\tests\logger_level_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\tests\logger_manager_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\tests\logger_name_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\tests\logger_specification_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\tests\logger_support_unittest.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\log\tests\logger_unittest.cc"
 				>
 			</File>
@@ -201,10 +231,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\lib\log\tests\root_logger_name_unittest.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\src\lib\log\tests\run_unittests.cc"
 				>
 			</File>
diff --git a/win32build/VS2008/libnsas/libnsas.vcproj b/win32build/VS2008/libnsas/libnsas.vcproj
index 3304b4f..1736a49 100755
--- a/win32build/VS2008/libnsas/libnsas.vcproj
+++ b/win32build/VS2008/libnsas/libnsas.vcproj
@@ -25,6 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\nsas&#x0D;&#x0A;..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe nsas_messages.mes&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -41,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\nsas;..\..\..\ext\asio;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\nsas;..\..\..\ext\asio;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -88,6 +89,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\nsas&#x0D;&#x0A;..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe nsas_messages.mes&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -105,7 +107,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\nsas;..\..\..\ext\asio;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\nsas;..\..\..\ext\asio;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -179,6 +181,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\nsas\nsas_log.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\nsas\nsas_messages.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\nsas\zone_entry.cc"
 				>
 			</File>
@@ -245,6 +255,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\nsas\nsas_log.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\nsas\nsas_messages.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\nsas\nsas_types.h"
 				>
 			</File>
diff --git a/win32build/VS2008/libnsas_tests/libnsas_tests.vcproj b/win32build/VS2008/libnsas_tests/libnsas_tests.vcproj
index 86b36f0..c4ac680 100755
--- a/win32build/VS2008/libnsas_tests/libnsas_tests.vcproj
+++ b/win32build/VS2008/libnsas_tests/libnsas_tests.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\nsas;..\..\..\ext\asio;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\nsas;..\..\..\ext\asio;..\..\..\..\gtest\include;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -62,10 +62,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib libasiolink.lib libnsas.lib gtestd.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libcryptolink.lib libdns++.lib libasiolink.lib libnsas.lib log4cplusSD.lib botan.lib gtestd.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libexceptions\Debug;..\libutil\Debug;"..\libdns++\Debug";..\libasiolink\Debug;..\libnsas\Debug;..\..\..\..\gtest\md9\Debug;"C:\Program Files\boost\boost_1_44\lib""
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libnsas\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";"$(BOOST)\lib""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -119,7 +119,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\nsas;..\..\..\ext\asio;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\nsas;..\..\..\ext\asio;..\..\..\..\gtest\include;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -139,10 +139,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib libasiolink.lib libnsas.lib gtest.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libcryptolink.lib libdns++.lib libasiolink.lib libnsas.lib log4cplusS.lib botan.lib gtest.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libexceptions\Release;..\libutil\Release;"..\libdns++\Release";..\libasiolink\Release;..\libnsas\Release;..\..\..\..\gtest\md9\Release;"C:\Program Files\boost\boost_1_44\lib""
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libnsas\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";"$(BOOST)\lib""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32build/VS2008/libresolve/libresolve.vcproj b/win32build/VS2008/libresolve/libresolve.vcproj
index a8b367f..f405602 100755
--- a/win32build/VS2008/libresolve/libresolve.vcproj
+++ b/win32build/VS2008/libresolve/libresolve.vcproj
@@ -25,6 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\resolve&#x0D;&#x0A;..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe resolve_messages.mes&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -41,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;..\..\..\ext\coroutine;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;..\..\..\ext\coroutine;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -88,6 +89,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\resolve&#x0D;&#x0A;..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe resolve_messages.mes&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -105,7 +107,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;..\..\..\ext\coroutine;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;..\..\..\ext\coroutine;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -159,6 +161,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\resolve\resolve_log.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\resolve\resolve_messages.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\resolve\resolver_callback.cc"
 				>
 			</File>
@@ -181,6 +191,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\resolve\resolve_log.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\resolve\resolve_messages.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\resolve\resolver_callback.h"
 				>
 			</File>
diff --git a/win32build/VS2008/libresolve_tests/libresolve_tests.vcproj b/win32build/VS2008/libresolve_tests/libresolve_tests.vcproj
index b712df8..834d5ad 100755
--- a/win32build/VS2008/libresolve_tests/libresolve_tests.vcproj
+++ b/win32build/VS2008/libresolve_tests/libresolve_tests.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;..\..\..\ext\coroutine;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;..\..\..\ext\coroutine;..\..\..\..\gtest\include;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -62,10 +62,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib liblog.lib libasiolink.lib libasiodns.lib libnsas.lib libcache.lib libresolve.lib gtestd.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libcryptolink.lib libdns++.lib libasiolink.lib libasiodns.lib libnsas.lib libcache.lib libresolve.lib log4cplusSD.lib botan.lib gtestd.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories=""C:\Program Files\boost\boost_1_44\lib";..\libexceptions\Debug;..\libutil\Debug;"..\libdns++\Debug";..\liblog\Debug;..\libasiolink\Debug;..\libasiodns\Debug;..\libnsas\Debug;..\libcache\Debug;..\libresolve\Debug;..\..\..\..\gtest\md9\Debug"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libasiodns\$(ConfigurationName)";"..\libnsas\$(ConfigurationName)";"..\libcache\$(ConfigurationName)";"..\libresolve\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";"$(BOOST)\lib""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -119,7 +119,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;..\..\..\ext\coroutine;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;..\..\..\ext\coroutine;..\..\..\..\gtest\include;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -139,10 +139,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib liblog.lib libasiolink.lib libasiodns.lib libnsas.lib libcache.lib libresolve.lib gtest.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libcryptolink.lib libdns++.lib libasiolink.lib libasiodns.lib libnsas.lib libcache.lib libresolve.lib log4cplusS.lib botan.lib gtest.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories=""C:\Program Files\boost\boost_1_44\lib";..\libexceptions\Release;..\libutil\Release;"..\libdns++\Release";..\liblog\Release;..\libasiolink\Release;..\libasiodns\Release;..\libnsas\Release;..\libcache\Release;..\libresolve\Release;..\..\..\..\gtest\md9\Release"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libasiodns\$(ConfigurationName)";"..\libnsas\$(ConfigurationName)";"..\libcache\$(ConfigurationName)";"..\libresolve\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";"$(BOOST)\lib""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32build/VS2008/libserver_common/libserver_common.vcproj b/win32build/VS2008/libserver_common/libserver_common.vcproj
index 0aabc00..bd51a4b 100755
--- a/win32build/VS2008/libserver_common/libserver_common.vcproj
+++ b/win32build/VS2008/libserver_common/libserver_common.vcproj
@@ -25,6 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\server_common&#x0D;&#x0A;..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe server_common_messages.mes&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -41,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\ext\asio;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\ext\asio;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -88,6 +89,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\server_common&#x0D;&#x0A;..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe server_common_messages.mes&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -105,7 +107,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\ext\asio;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\ext\asio;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -151,9 +153,25 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
+				RelativePath="..\..\..\src\lib\server_common\client.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\server_common\keyring.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\server_common\logger.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\server_common\portconfig.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\lib\server_common\server_common_messages.cc"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -161,9 +179,25 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
+				RelativePath="..\..\..\src\lib\server_common\client.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\server_common\keyring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\server_common\logger.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\server_common\portconfig.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\lib\server_common\server_common_messages.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/win32build/VS2008/libserver_common_tests/libserver_common_tests.vcproj b/win32build/VS2008/libserver_common_tests/libserver_common_tests.vcproj
index 8f53780..8cbfa75 100755
--- a/win32build/VS2008/libserver_common_tests/libserver_common_tests.vcproj
+++ b/win32build/VS2008/libserver_common_tests/libserver_common_tests.vcproj
@@ -25,6 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\server_common\tests&#x0D;&#x0A;copy data_path.h.win32 data_path.h&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -41,8 +42,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\server_common;..\..\..\ext\asio;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\server_common;..\..\..\ext\asio;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="BIND10HOME=\"$(BIND10HOME)\""
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -62,10 +63,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib libcc.lib liblog.lib libasiolink.lib libasiodns.lib libserver_common.lib gtestd.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libcryptolink.lib libdns++.lib libcc.lib libcfgclient.lib libfake_session.lib libacl.lib libasiolink.lib libasiodns.lib libserver_common.lib log4cplusSD.lib botan.lib gtestd.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories=""C:\Program Files\boost\boost_1_44\lib";..\libexceptions\Debug;..\libutil\Debug;"..\libdns++\Debug";..\libcc\Debug;..\liblog\Debug;..\libasiolink\Debug;..\libasiodns\Debug;..\libserver_common\Debug;..\..\..\..\gtest\md9\Debug"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libcfgclient\$(ConfigurationName)";"..\libfake_session\$(ConfigurationName)";"..\libacl\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libasiodns\$(ConfigurationName)";"..\libserver_common\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";"$(BOOST)\lib""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -102,6 +103,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\server_common\tests&#x0D;&#x0A;copy data_path.h.win32 data_path.h&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -119,8 +121,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\server_common;..\..\..\ext\asio;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\server_common;..\..\..\ext\asio;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="BIND10HOME=\"$(BIND10HOME)\""
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -139,10 +141,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib libcc.lib liblog.lib libasiolink.lib libasiodns.lib libserver_common.lib gtest.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libcryptolink.lib libdns++.lib libcc.lib libcfgclient.lib libfake_session.lib libacl.lib libasiolink.lib libasiodns.lib libserver_common.lib log4cplusS.lib botan.lib gtest.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories=""C:\Program Files\boost\boost_1_44\lib";..\libexceptions\Release;..\libutil\Release;"..\libdns++\Release";..\libcc\Release;..\liblog\Release;..\libasiolink\Release;..\libasiodns\Release;..\libserver_common\Release;..\..\..\..\gtest\md9\Release"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libcfgclient\$(ConfigurationName)";"..\libfake_session\$(ConfigurationName)";"..\libacl\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\libasiodns\$(ConfigurationName)";"..\libserver_common\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)";"$(BOOST)\lib""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -181,6 +183,14 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
+				RelativePath="..\..\..\src\lib\server_common\tests\client_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\server_common\tests\keyring_test.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\server_common\tests\portconfig_unittest.cc"
 				>
 			</File>
@@ -194,6 +204,10 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath="..\..\..\src\lib\server_common\tests\data_path.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/win32build/VS2008/libtestutils/libtestutils.vcproj b/win32build/VS2008/libtestutils/libtestutils.vcproj
index dc81f22..4d8d4ef 100755
--- a/win32build/VS2008/libtestutils/libtestutils.vcproj
+++ b/win32build/VS2008/libtestutils/libtestutils.vcproj
@@ -25,6 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\testutils\testdata&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o badExampleQuery_fromWire.wire badExampleQuery_fromWire.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o examplequery_fromWire.wire examplequery_fromWire.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o iquery_fromWire.wire iquery_fromWire.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o iquery_response_fromWire.wire iquery_response_fromWire.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o iqueryresponse_fromWire.wire iqueryresponse_fromWire.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o multiquestion_fromWire.wire multiquestion_fromWire.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o queryBadEDNS_fromWire.wire queryBadEDNS_fromWire.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/
 gen_wiredata.py -o shortanswer_fromWire.wire shortanswer_fromWire.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o simplequery_fromWire.wire simplequery_fromWire.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o simpleresponse_fromWire.wire simpleresponse_fromWire.spec&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -41,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\ext\asio;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\ext\asio;..\..\..\..\gtest\include;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -88,6 +89,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\testutils\testdata&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o badExampleQuery_fromWire.wire badExampleQuery_fromWire.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o examplequery_fromWire.wire examplequery_fromWire.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o iquery_fromWire.wire iquery_fromWire.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o iquery_response_fromWire.wire iquery_response_fromWire.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o iqueryresponse_fromWire.wire iqueryresponse_fromWire.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o multiquestion_fromWire.wire multiquestion_fromWire.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o queryBadEDNS_fromWire.wire queryBadEDNS_fromWire.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/
 gen_wiredata.py -o shortanswer_fromWire.wire shortanswer_fromWire.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o simplequery_fromWire.wire simplequery_fromWire.spec&#x0D;&#x0A;python $(BIND10HOME)/src/lib/util/python/gen_wiredata.py -o simpleresponse_fromWire.wire simpleresponse_fromWire.spec&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -105,7 +107,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\ext\asio;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\ext\asio;..\..\..\..\gtest\include;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
diff --git a/win32build/VS2008/libutil/libutil.vcproj b/win32build/VS2008/libutil/libutil.vcproj
index be4b71e..419e2d3 100755
--- a/win32build/VS2008/libutil/libutil.vcproj
+++ b/win32build/VS2008/libutil/libutil.vcproj
@@ -25,6 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\util\python&#x0D;&#x0A;copy gen_wiredata.py.win32 gen_wiredata.py&#x0D;&#x0A;copy mkpywrapper.py.win32 mkpywrapper.py&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -41,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\exceptions;..\..\..\src\lib\util;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\exceptions;..\..\..\src\lib\util;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -88,6 +89,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\util\python&#x0D;&#x0A;copy gen_wiredata.py.win32 gen_wiredata.py&#x0D;&#x0A;copy mkpywrapper.py.win32 mkpywrapper.py&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -105,7 +107,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\exceptions;..\..\..\src\lib\util;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\exceptions;..\..\..\src\lib\util;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
diff --git a/win32build/VS2008/libutil_io_python/libutil_io_python.vcproj b/win32build/VS2008/libutil_io_python/libutil_io_python.vcproj
index 61400e5..9b372c2 100755
--- a/win32build/VS2008/libutil_io_python/libutil_io_python.vcproj
+++ b/win32build/VS2008/libutil_io_python/libutil_io_python.vcproj
@@ -64,7 +64,7 @@
 				AdditionalDependencies="libutil_io.lib python32_d.lib ws2_32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_d.pyd"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libutil_io\Debug;C:\Python32\libs"
+				AdditionalLibraryDirectories="..\libutil_io\$(ConfigurationName);C:\Python32\libs"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -140,7 +140,7 @@
 				AdditionalDependencies="libutil_io.lib python32.lib ws2_32.lib"
 				OutputFile="$(OutDir)\$(ProjectName).pyd"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libutil_io\Release;C:\Python32\libs"
+				AdditionalLibraryDirectories="..\libutil_io\$(ConfigurationName);C:\Python32\libs"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
diff --git a/win32build/VS2008/libutil_io_tests/libutil_io_tests.vcproj b/win32build/VS2008/libutil_io_tests/libutil_io_tests.vcproj
index 10967d1..3c0385d 100755
--- a/win32build/VS2008/libutil_io_tests/libutil_io_tests.vcproj
+++ b/win32build/VS2008/libutil_io_tests/libutil_io_tests.vcproj
@@ -64,7 +64,7 @@
 				AdditionalDependencies="libutil_io.lib libutil_unittests.lib gtestd.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libutil_io\Debug;..\libutil_unittests\Debug;..\..\..\..\gtest\md9\Debug"
+				AdditionalLibraryDirectories="..\libutil_io\$(ConfigurationName);..\libutil_unittests\$(ConfigurationName);..\..\..\..\gtest\md9\$(ConfigurationName)"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -140,7 +140,7 @@
 				AdditionalDependencies="libutil_io.lib libutil_unittests.lib gtest.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libutil_io\Release;..\libutil_unittests\Release;..\..\..\..\gtest\md9\Release"
+				AdditionalLibraryDirectories="..\libutil_io\$(ConfigurationName);..\libutil_unittests\$(ConfigurationName);..\..\..\..\gtest\md9\$(ConfigurationName)"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32build/VS2008/libutil_tests/libutil_tests.vcproj b/win32build/VS2008/libutil_tests/libutil_tests.vcproj
index f1476ef..f53bf7c 100755
--- a/win32build/VS2008/libutil_tests/libutil_tests.vcproj
+++ b/win32build/VS2008/libutil_tests/libutil_tests.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\exceptions;..\..\..\src\lib\utils;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\exceptions;..\..\..\src\lib\utils;..\..\..\..\gtest\include;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -62,10 +62,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib gtestd.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_io.lib libutil_unittests.lib gtestd.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\libexceptions\Debug;..\libutil\Debug;..\..\..\..\gtest\md9\Debug"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_io\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -119,7 +119,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\exceptions;..\..\..\src\lib\utils;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\exceptions;..\..\..\src\lib\utils;..\..\..\..\gtest\include;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -139,10 +139,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libexceptions.lib libutil.lib gtest.lib"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_io.lib libutil_unittests.lib gtest.lib"
 				OutputFile="$(OutDir)\run_unittests.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\libexceptions\Release;..\libutil\Release;..\..\..\..\gtest\md9\Release"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_io\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -193,6 +193,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\util\tests\fd_tests.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\util\tests\filename_unittest.cc"
 				>
 			</File>
diff --git a/win32build/VS2008/libutil_unittests/libutil_unittests.vcproj b/win32build/VS2008/libutil_unittests/libutil_unittests.vcproj
index 52aaf9a..64adedd 100755
--- a/win32build/VS2008/libutil_unittests/libutil_unittests.vcproj
+++ b/win32build/VS2008/libutil_unittests/libutil_unittests.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -158,6 +158,14 @@
 				RelativePath="..\..\..\src\lib\util\unittests\newhook.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\lib\util\unittests\run_all.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\util\unittests\testdata.cc"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -176,6 +184,18 @@
 				RelativePath="..\..\..\src\lib\util\unittests\resolver.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\lib\util\unittests\run_all.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\util\unittests\testdata.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\util\unittests\textdata.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/win32build/VS2008/libxfr/libxfr.vcproj b/win32build/VS2008/libxfr/libxfr.vcproj
index 65d5fca..3c41b85 100755
--- a/win32build/VS2008/libxfr/libxfr.vcproj
+++ b/win32build/VS2008/libxfr/libxfr.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;"C:\Program Files\boost\boost_1_44""
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;"$(BOOST)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
diff --git a/win32build/VS2008/pydacl/pydacl.vcproj b/win32build/VS2008/pydacl/pydacl.vcproj
new file mode 100755
index 0000000..28302a1
--- /dev/null
+++ b/win32build/VS2008/pydacl/pydacl.vcproj
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="pydacl"
+	ProjectGUID="{C138D564-102E-42AB-947B-C96B0F4A0A1A}"
+	RootNamespace="pydacl"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..;..\..\..\src\lib;"$(BOOST)";C:\Python32\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYDACL_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libacl.lib python32_d.lib"
+				OutputFile="$(OutDir)\acl.pyd"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libacl\$(ConfigurationName)";C:\Python32\libs"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..;..\..\..\src\lib;"$(BOOST)";C:\Python32\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYDACL_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libacl.lib python32.lib"
+				OutputFile="$(OutDir)\acl.pyd"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libacl\$(ConfigurationName)";C:\Python32\libs"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\acl\acl.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\acl\acl_inc.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/pyddatasrc/pyddatasrc.vcproj b/win32build/VS2008/pyddatasrc/pyddatasrc.vcproj
new file mode 100755
index 0000000..9fd592f
--- /dev/null
+++ b/win32build/VS2008/pyddatasrc/pyddatasrc.vcproj
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="pyddatasrc"
+	ProjectGUID="{B564FA1E-1B2F-42A9-9A2F-F340DC430848}"
+	RootNamespace="pyddatasrc"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\python\isc\datasrc;"$(BOOST)";C:\Python32\include;C:\sqlite3"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYDDATASRC_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib liblog.lib libcryptolink.lib libdns++.lib libdns++_python.lib libcc.lib libdatasrc.lib log4cplusSD.lib botan.lib sqlite3.lib"
+				OutputFile="$(OutDir)\datasrc.pyd"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libdns++_python\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libdatasrc\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";C:\Python32\libs;C:\sqlite3"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\python\isc\datasrc;"$(BOOST)";C:\Python32\include;C:\sqlite3"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYDDATASRC_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib liblog.lib libcryptolink.lib libdns++.lib libdns++_python.lib libcc.lib libdatasrc.lib log4cplusS.lib botan.lib sqlite3.lib"
+				OutputFile="$(OutDir)\datasrc.pyd"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libdns++_python\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libdatasrc\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";C:\Python32\libs;C:\sqlite3"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\datasrc\client_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\datasrc\datasrc.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\datasrc\finder_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\datasrc\iterator_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\datasrc\updater_python.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\datasrc\client_inc.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\datasrc\client_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\datasrc\datasrc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\datasrc\finder_inc.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\datasrc\finder_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\datasrc\iterator_inc.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\datasrc\iterator_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\datasrc\updater_inc.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\datasrc\updater_python.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/pyddns++/pyddns++.vcproj b/win32build/VS2008/pyddns++/pyddns++.vcproj
new file mode 100755
index 0000000..ad1e95c
--- /dev/null
+++ b/win32build/VS2008/pyddns++/pyddns++.vcproj
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="pyddns++"
+	ProjectGUID="{C5617D33-76BA-4388-AB0E-FC06CFAAA865}"
+	RootNamespace="pyddns"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\python&#x0D;&#x0A;copy bind10_config.py.win32 bind10_config.py"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns\python;C:\Python32\include;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libcryptolink.lib libdns++.lib libdns++_python.lib botan.lib python32_d.lib ws2_32.lib"
+				OutputFile="$(OutDir)\pydnspp_d.pyd"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libdns++_python\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";C:\Python32\libs"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy ..\..\..\src\lib\util\pyunittests\pyunittests_util.py.win32 ..\..\..\src\lib\dns\python\tests\pyunittests_util.py"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\python&#x0D;&#x0A;copy bind10_config.py.win32 bind10_config.py"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns\python;C:\Python32\include;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libcryptolink.lib libdns++.lib libdns++_python.lib botan.lib python32.lib ws2_32.lib"
+				OutputFile="$(OutDir)\pydnspp.pyd"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libdns++_python\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";C:\Python32\libs"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy ..\..\..\src\lib\util\pyunittests\pyunittests_util.py.win32 ..\..\..\src\lib\dns\python\tests\pyunittests_util.py"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\dns\python\pydnspp.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/pyddnsacl/pyddnsacl.vcproj b/win32build/VS2008/pyddnsacl/pyddnsacl.vcproj
new file mode 100755
index 0000000..9f30f0a
--- /dev/null
+++ b/win32build/VS2008/pyddnsacl/pyddnsacl.vcproj
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="pyddnsacl"
+	ProjectGUID="{50427469-52BA-4961-80AF-7591198BB1D2}"
+	RootNamespace="pyddnsacl"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"$(BOOST)";C:\Python32\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYDDNSACL_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib libcc.lib libacl.lib libdnsacl.lib python32_d.lib ws2_32.lib"
+				OutputFile="$(OutDir)\_dns.pyd"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libacl\$(ConfigurationName)";"..\libdnsacl\$(ConfigurationName)";C:\Python32\libs"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"$(BOOST)";C:\Python32\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYDDNSACL_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib libcc.lib libacl.lib libdnsacl.lib python32.lib ws2_32.lib"
+				OutputFile="$(OutDir)\_dns.pyd"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libacl\$(ConfigurationName)";"..\libdnsacl\$(ConfigurationName)";C:\Python32\libs"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\acl\dns.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\acl\dns_requestacl_inc.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\acl\dns_requestacl_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\acl\dns_requestcontext_inc.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\acl\dns_requestcontext_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\acl\dns_requestloader_inc.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\acl\dns_requestloader_python.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\acl\dnsacl_inc.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\acl\dns.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\acl\dns_requestacl_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\acl\dns_requestcontext_python.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\acl\dns_requestloader_python.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/pydlog/pydlog.vcproj b/win32build/VS2008/pydlog/pydlog.vcproj
new file mode 100755
index 0000000..e285d3d
--- /dev/null
+++ b/win32build/VS2008/pydlog/pydlog.vcproj
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="pydlog"
+	ProjectGUID="{B14E334B-B2E5-4A7E-8A55-157BD70ECBE5}"
+	RootNamespace="pydlog"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"$(BOOST)";C:\Python32\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYDLOG_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib liblog.lib libcc.lib libcfgclient.lib log4cplusSD.lib python32_d.lib"
+				OutputFile="$(OutDir)\log.pyd"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libcfgclient\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";C:\Python32\libs"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"$(BOOST)";C:\Python32\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYDLOG_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib liblog.lib libcc.lib libcfgclient.lib log4cplusS.lib python32.lib"
+				OutputFile="$(OutDir)\log.pyd"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcc\$(ConfigurationName)";"..\libcfgclient\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";C:\Python32\libs"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\python\isc\log\log.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/pydutil_io/pydutil_io.vcproj b/win32build/VS2008/pydutil_io/pydutil_io.vcproj
new file mode 100755
index 0000000..8510483
--- /dev/null
+++ b/win32build/VS2008/pydutil_io/pydutil_io.vcproj
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="pydutil_io"
+	ProjectGUID="{D20A3656-A6C5-4838-B20B-0329DE0AB187}"
+	RootNamespace="pydutil_io"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..;..\..\..\src\lib;C:\Python32\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYDUTIL_IO_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libutil_io.lib python32_d.lib ws2_32.lib"
+				OutputFile="$(OutDir)\libutil_io_python.pyd"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="C:\Python32\libs;"..\libutil_io\$(ConfigurationName)""
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..;..\..\..\src\lib;C:\Python32\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYDUTIL_IO_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libutil_io.lib python32.lib ws2_32.lib"
+				OutputFile="$(OutDir)\libutil_io_python.pyd"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="C:\Python32\libs;"..\libutil_io\$(ConfigurationName)""
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\util\io\fdshare_python.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/tt-badpacket/tt-badpacket.vcproj b/win32build/VS2008/tt-badpacket/tt-badpacket.vcproj
new file mode 100755
index 0000000..9734866
--- /dev/null
+++ b/win32build/VS2008/tt-badpacket/tt-badpacket.vcproj
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="tt-badpacket"
+	ProjectGUID="{09471D02-D601-4EFA-B342-0DCFE9082737}"
+	RootNamespace="ttbadpacket"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\ext\asio;..\..\..\ext\coroutine;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib liblog.lib libcryptolink.lib libdns++.lib libasiolink.lib libasiodns.lib log4cplusSD.lib botan.lib"
+				OutputFile="$(OutDir)\badpacket.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libasiodns\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"$(BOOST)\lib""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\ext\asio;..\..\..\ext\coroutine;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib liblog.lib libcryptolink.lib libdns++.lib libasiolink.lib libasiodns.lib log4cplusS.lib botan.lib"
+				OutputFile="$(OutDir)\badpacket.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libcryptolink\$(ConfigurationName)";"..\libdns++\$(ConfigurationName)";"..\libasiodns\$(ConfigurationName)";"..\libasiolink\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\botan\md9\$(ConfigurationName)";"$(BOOST)\lib""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\tests\tools\badpacket\badpacket.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tests\tools\badpacket\command_options.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\getopt_long.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tests\tools\badpacket\option_info.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tests\tools\badpacket\scan.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\tests\tools\badpacket\command_options.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\getopt_long.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tests\tools\badpacket\header_flags.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tests\tools\badpacket\option_info.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tests\tools\badpacket\scan.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tests\tools\badpacket\version.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/tt-badpacket_tests/tt-badpacket_tests.vcproj b/win32build/VS2008/tt-badpacket_tests/tt-badpacket_tests.vcproj
new file mode 100755
index 0000000..1846adc
--- /dev/null
+++ b/win32build/VS2008/tt-badpacket_tests/tt-badpacket_tests.vcproj
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="tt-badpacket_tests"
+	ProjectGUID="{8AC71185-0619-477C-8C15-0E59D6DEB127}"
+	RootNamespace="ttbadpacket_tests"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib gtestd.lib"
+				OutputFile="$(OutDir)\run_unittests.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib gtest.lib"
+				OutputFile="$(OutDir)\run_unittests.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\tests\tools\badpacket\command_options.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tests\tools\badpacket\tests\command_options_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\getopt_long.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tests\tools\badpacket\tests\header_flags_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tests\tools\badpacket\option_info.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tests\tools\badpacket\tests\option_info_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tests\tools\badpacket\tests\run_unittests.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\tests\tools\badpacket\command_options.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\getopt_long.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tests\tools\badpacket\option_info.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2010/b10-dhcp6/b10-dhcp6.vcxproj b/win32build/VS2010/b10-dhcp6/b10-dhcp6.vcxproj
index d6c4585..35c21cf 100755
--- a/win32build/VS2010/b10-dhcp6/b10-dhcp6.vcxproj
+++ b/win32build/VS2010/b10-dhcp6/b10-dhcp6.vcxproj
@@ -98,6 +98,7 @@ copy spec_config.h.win32 spec_config.h
     <ClInclude Include="..\..\..\src\bin\dhcp6\dhcp6_srv.h" />
     <ClInclude Include="..\..\..\src\bin\dhcp6\iface_mgr.h" />
     <ClInclude Include="..\..\..\src\bin\dhcp6\pkt6.h" />
+    <ClInclude Include="..\..\..\src\bin\dhcp6\spec_config.h" />
     <ClInclude Include="..\..\getopt.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/win32build/VS2010/b10-dhcp6/b10-dhcp6.vcxproj.filters b/win32build/VS2010/b10-dhcp6/b10-dhcp6.vcxproj.filters
index 8ee906c..6972f39 100755
--- a/win32build/VS2010/b10-dhcp6/b10-dhcp6.vcxproj.filters
+++ b/win32build/VS2010/b10-dhcp6/b10-dhcp6.vcxproj.filters
@@ -30,6 +30,9 @@
     <ClInclude Include="..\..\..\src\bin\dhcp6\pkt6.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\bin\dhcp6\spec_config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\bin\dhcp6\dhcp6_srv.cc">
diff --git a/win32build/VS2010/libdns++/libdns++.vcxproj b/win32build/VS2010/libdns++/libdns++.vcxproj
index 7675fd7..e4685fa 100755
--- a/win32build/VS2010/libdns++/libdns++.vcxproj
+++ b/win32build/VS2010/libdns++/libdns++.vcxproj
@@ -27,7 +27,6 @@
     <ClInclude Include="..\..\..\src\lib\dns\rdata\generic\detail\ds_like.h" />
     <ClInclude Include="..\..\..\src\lib\dns\rdata\generic\detail\nsec_bitmap.h" />
     <ClInclude Include="..\..\..\src\lib\dns\rdata\generic\detail\txt_like.h" />
-    <ClInclude Include="..\..\..\src\lib\dns\rdata\generic\dlv_32769.h" />
     <ClInclude Include="..\..\..\src\lib\dns\rrclass.h" />
     <ClInclude Include="..\..\..\src\lib\dns\rrparamregistry.h" />
     <ClInclude Include="..\..\..\src\lib\dns\rrset.h" />
diff --git a/win32build/VS2010/libdns++/libdns++.vcxproj.filters b/win32build/VS2010/libdns++/libdns++.vcxproj.filters
index bb218b1..ef199c9 100755
--- a/win32build/VS2010/libdns++/libdns++.vcxproj.filters
+++ b/win32build/VS2010/libdns++/libdns++.vcxproj.filters
@@ -93,9 +93,6 @@
     <ClInclude Include="..\..\..\src\lib\dns\rdata\generic\detail\ds_like.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\lib\dns\rdata\generic\dlv_32769.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\lib\dns\rdata\generic\detail\nsec_bitmap.cc">
diff --git a/win32build/VS2010/libresolve/libresolve.vcxproj b/win32build/VS2010/libresolve/libresolve.vcxproj
index 7af8cde..6b3df55 100755
--- a/win32build/VS2010/libresolve/libresolve.vcxproj
+++ b/win32build/VS2010/libresolve/libresolve.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -16,6 +16,7 @@
     <ClInclude Include="..\..\..\src\lib\resolve\resolver_callback.h" />
     <ClInclude Include="..\..\..\src\lib\resolve\resolver_interface.h" />
     <ClInclude Include="..\..\..\src\lib\resolve\resolve_log.h" />
+    <ClInclude Include="..\..\..\src\lib\resolve\resolve_messages.h" />
     <ClInclude Include="..\..\..\src\lib\resolve\response_classifier.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/win32build/VS2010/libresolve/libresolve.vcxproj.filters b/win32build/VS2010/libresolve/libresolve.vcxproj.filters
index a670573..5fba740 100755
--- a/win32build/VS2010/libresolve/libresolve.vcxproj.filters
+++ b/win32build/VS2010/libresolve/libresolve.vcxproj.filters
@@ -33,6 +33,9 @@
     <ClInclude Include="..\..\..\src\lib\resolve\resolve_log.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\lib\resolve\resolve_messages.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\lib\resolve\recursive_query.cc">




More information about the bind10-changes mailing list