diff --git a/libs/win32/ldns/ldns-lib/ldns-lib.2008.vcproj b/libs/win32/ldns/ldns-lib/ldns-lib.2008.vcproj
new file mode 100644
index 0000000000..12509c6666
--- /dev/null
+++ b/libs/win32/ldns/ldns-lib/ldns-lib.2008.vcproj
@@ -0,0 +1,632 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="ldns"
+	ProjectGUID="{23B4D303-79FC-49E0-89E2-2280E7E28940}"
+	RootNamespace="ldns"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="if not exist &quot;$(ProjectDir)..\..\..\ldns\ldns\config.h&quot; type &quot;$(ProjectDir)\config.h&quot; &gt; &quot;$(ProjectDir)..\..\..\ldns\ldns\config.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\..\ldns\ldns\util.h&quot; type &quot;$(ProjectDir)\util.h&quot; &gt; &quot;$(ProjectDir)..\..\..\ldns\ldns\util.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\..\ldns\ldns\net.h&quot; type &quot;$(ProjectDir)\net.h&quot; &gt; &quot;$(ProjectDir)..\..\..\ldns\ldns\net.h&quot;&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\ldns\;."
+				PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				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="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="if not exist &quot;$(ProjectDir)..\..\..\ldns\ldns\config.h&quot; type &quot;$(ProjectDir)\config.h&quot; &gt; &quot;$(ProjectDir)..\..\..\ldns\ldns\config.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\..\ldns\ldns\util.h&quot; type &quot;$(ProjectDir)\util.h&quot; &gt; &quot;$(ProjectDir)..\..\..\ldns\ldns\util.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\..\ldns\ldns\net.h&quot; type &quot;$(ProjectDir)\net.h&quot; &gt; &quot;$(ProjectDir)..\..\..\ldns\ldns\net.h&quot;&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\..\ldns\;."
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				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>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="if not exist &quot;$(ProjectDir)..\..\..\ldns\ldns\config.h&quot; type &quot;$(ProjectDir)\config.h&quot; &gt; &quot;$(ProjectDir)..\..\..\ldns\ldns\config.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\..\ldns\ldns\util.h&quot; type &quot;$(ProjectDir)\util.h&quot; &gt; &quot;$(ProjectDir)..\..\..\ldns\ldns\util.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\..\ldns\ldns\net.h&quot; type &quot;$(ProjectDir)\net.h&quot; &gt; &quot;$(ProjectDir)..\..\..\ldns\ldns\net.h&quot;&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\ldns\;."
+				PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				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>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="if not exist &quot;$(ProjectDir)..\..\..\ldns\ldns\config.h&quot; type &quot;$(ProjectDir)\config.h&quot; &gt; &quot;$(ProjectDir)..\..\..\ldns\ldns\config.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\..\ldns\ldns\util.h&quot; type &quot;$(ProjectDir)\util.h&quot; &gt; &quot;$(ProjectDir)..\..\..\ldns\ldns\util.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\..\ldns\ldns\net.h&quot; type &quot;$(ProjectDir)\net.h&quot; &gt; &quot;$(ProjectDir)..\..\..\ldns\ldns\net.h&quot;&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\..\ldns\;."
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<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="..\..\..\ldns\compat\b32_ntop.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\compat\b32_pton.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\compat\b64_ntop.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\compat\b64_pton.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\buffer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\compat\ctime_r.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\dname.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\dnssec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\dnssec_sign.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\dnssec_verify.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\dnssec_zone.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\error.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\compat\fake-rfc2553.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\compat\fake-rfc2553.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\compat\gettimeofday.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\compat\gettimeofday.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\compat\gmtime_r.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\higher.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\host2str.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\host2wire.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\compat\inet_aton.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\compat\inet_ntop.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\compat\inet_pton.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\compat\isblank.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\keys.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\linktest.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\compat\malloc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\compat\memmove.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\net.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\packet.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\parse.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\rbtree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\rdata.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\compat\realloc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\resolver.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\rr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\rr_functions.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\sha1.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\sha2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\compat\snprintf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\str2host.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\compat\strlcpy.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\compat\timegm.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\tsig.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\update.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\wire2host.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\zone.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\ldns\ldns\buffer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\config.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\dname.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\dnssec.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\dnssec_sign.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\dnssec_verify.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\dnssec_zone.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\error.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\higher.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\host2str.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\host2wire.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\keys.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\ldns.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\net.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\packet.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\parse.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\rbtree.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\rdata.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\resolver.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\rr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\rr_functions.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\sha1.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\sha2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\str2host.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\tsig.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\update.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\util.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\util.h.in"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ldns\ldns\zone.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>
+		<File
+			RelativePath=".\ldns\readme.txt"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/libs/win32/ldns/ldns-lib/ldns-lib.2010.vcxproj b/libs/win32/ldns/ldns-lib/ldns-lib.2010.vcxproj
index e10a283c3d..cc21a20de0 100644
--- a/libs/win32/ldns/ldns-lib/ldns-lib.2010.vcxproj
+++ b/libs/win32/ldns/ldns-lib/ldns-lib.2010.vcxproj
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\ldns\;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAVE_STRUCT_ADDRINFO;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -88,17 +88,27 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
+    <PreBuildEvent>
+      <Command>if not exist "$(ProjectDir)..\..\..\ldns\ldns\config.h" type "$(ProjectDir)\config.h" &amp;gt; "$(ProjectDir)..\..\..\ldns\ldns\config.h"
+if not exist "$(ProjectDir)..\..\..\ldns\ldns\util.h" type "$(ProjectDir)\util.h" &amp;gt; "$(ProjectDir)..\..\..\ldns\ldns\util.h"
+if not exist "$(ProjectDir)..\..\..\ldns\ldns\net.h" type "$(ProjectDir)\net.h" &amp;gt; "$(ProjectDir)..\..\..\ldns\ldns\net.h"</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\ldns\;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAVE_STRUCT_ADDRINFO;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
+    <PreBuildEvent>
+      <Command>if not exist "$(ProjectDir)..\..\..\ldns\ldns\config.h" type "$(ProjectDir)\config.h" &amp;gt; "$(ProjectDir)..\..\..\ldns\ldns\config.h"
+if not exist "$(ProjectDir)..\..\..\ldns\ldns\util.h" type "$(ProjectDir)\util.h" &amp;gt; "$(ProjectDir)..\..\..\ldns\ldns\util.h"
+if not exist "$(ProjectDir)..\..\..\ldns\ldns\net.h" type "$(ProjectDir)\net.h" &amp;gt; "$(ProjectDir)..\..\..\ldns\ldns\net.h"</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -109,6 +119,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <PreprocessorDefinitions>HAVE_STRUCT_ADDRINFO;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\ldns\;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -116,6 +127,11 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
+    <PreBuildEvent>
+      <Command>if not exist "$(ProjectDir)..\..\..\ldns\ldns\config.h" type "$(ProjectDir)\config.h" &amp;gt; "$(ProjectDir)..\..\..\ldns\ldns\config.h"
+if not exist "$(ProjectDir)..\..\..\ldns\ldns\util.h" type "$(ProjectDir)\util.h" &amp;gt; "$(ProjectDir)..\..\..\ldns\ldns\util.h"
+if not exist "$(ProjectDir)..\..\..\ldns\ldns\net.h" type "$(ProjectDir)\net.h" &amp;gt; "$(ProjectDir)..\..\..\ldns\ldns\net.h"</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -126,7 +142,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <PreprocessorDefinitions>HAVE_STRUCT_ADDRINFO;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\ldns\;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\ldns\;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -135,9 +151,9 @@
       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>if not exist "$(ProjectDir)..\..\..\ldns\ldns\config.h" type "$(ProjectDir)\config.h" &gt; "$(ProjectDir)..\..\..\ldns\ldns\config.h"
-if not exist "$(ProjectDir)..\..\..\ldns\ldns\util.h" type "$(ProjectDir)\util.h" &gt; "$(ProjectDir)..\..\..\ldns\ldns\util.h"
-if not exist "$(ProjectDir)..\..\..\ldns\ldns\net.h" type "$(ProjectDir)\net.h" &gt; "$(ProjectDir)..\..\..\ldns\ldns\net.h"</Command>
+      <Command>if not exist "$(ProjectDir)..\..\..\ldns\ldns\config.h" type "$(ProjectDir)\config.h" &amp;gt; "$(ProjectDir)..\..\..\ldns\ldns\config.h"
+if not exist "$(ProjectDir)..\..\..\ldns\ldns\util.h" type "$(ProjectDir)\util.h" &amp;gt; "$(ProjectDir)..\..\..\ldns\ldns\util.h"
+if not exist "$(ProjectDir)..\..\..\ldns\ldns\net.h" type "$(ProjectDir)\net.h" &amp;gt; "$(ProjectDir)..\..\..\ldns\ldns\net.h"</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>