Regenerating VisualStudio projects

2025-11-02 05:46:22 +01:00 · 2018-06-20 09:47:40 +02:00
parent 416a99e61f
commit 5dbb9cc3de
1112 changed files with 11085 additions and 15462 deletions
--- a/Data/PostgreSQL/testsuite/TestSuite.progen
+++ b/Data/PostgreSQL/testsuite/TestSuite.progen
@@ -9,7 +9,7 @@ vc.project.prototype = TestSuite_vs90.vcproj
 postgresql = ${vc.project.pocobase}\\postgresql
 vc.project.compiler.include = ${postgresql}\\include;${vc.project.pocobase}\\Foundation\\include;${vc.project.pocobase}\\Data\\include
 vc.project.compiler.defines = _CRT_SECURE_NO_WARNINGS
-vc.project.linker.dependencies =
+vc.project.linker.dependencies = iphlpapi.lib
 vc.project.linker.dependencies.debug_shared =
 vc.project.linker.dependencies.release_shared =
 vc.project.linker.dependencies.debug_static_md =
--- a/Data/PostgreSQL/testsuite/TestSuite_CE_vs90.vcproj
+++ b/Data/PostgreSQL/testsuite/TestSuite_CE_vs90.vcproj
@@ -57,7 +57,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin\$(PlatformName)\shared\TestSuited.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"
@@ -130,7 +130,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin\$(PlatformName)\shared\TestSuite.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"
@@ -204,7 +204,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin\$(PlatformName)\static_mt\TestSuited.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"
@@ -280,7 +280,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin\$(PlatformName)\static_mt\TestSuite.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"
@@ -354,7 +354,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin\$(PlatformName)\static_md\TestSuited.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"
@@ -430,7 +430,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin\$(PlatformName)\static_md\TestSuite.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"
--- a/Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj
+++ b/Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj
@@ -32,7 +32,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
+				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -57,7 +57,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin\TestSuited.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib"
@@ -106,7 +106,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
+				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -129,7 +129,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin\TestSuite.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib"
@@ -174,7 +174,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
+				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -199,7 +199,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin\static_mt\TestSuited.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib"
@@ -249,7 +249,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
+				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -272,7 +272,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin\static_mt\TestSuite.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib"
@@ -318,7 +318,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
+				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -343,7 +343,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin\static_md\TestSuited.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib"
@@ -392,7 +392,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
+				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -415,7 +415,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin\static_md\TestSuite.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib"
--- a/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters
+++ b/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="PostgreSQL">
-      <UniqueIdentifier>{aa897198-28ec-4998-8b72-382245dd2735}</UniqueIdentifier>
+      <UniqueIdentifier>{81237c91-f6d8-4cd4-94ad-e4487b9e7e2a}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Header Files">
-      <UniqueIdentifier>{102789c0-9cb2-4ad7-80fe-431f58653852}</UniqueIdentifier>
+      <UniqueIdentifier>{8519ea4b-2e8f-4157-8406-d162abeed085}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Source Files">
-      <UniqueIdentifier>{c7626815-71a6-4122-9a56-cce842ecf9e0}</UniqueIdentifier>
+      <UniqueIdentifier>{4c958ab0-c0de-4f06-adea-c56d1e7b63ae}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{6142a588-cc14-49b3-87a2-3a80e99b8aac}</UniqueIdentifier>
+      <UniqueIdentifier>{e7762e79-f57b-412b-bbcd-3180dc781b0a}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{932f527f-3f29-42ff-b049-e7d7a2a84542}</UniqueIdentifier>
+      <UniqueIdentifier>{d3e83d8f-c787-43ac-953e-79b7e9dfb09f}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{e541abd8-25d3-433d-b655-c4f2d1a73505}</UniqueIdentifier>
+      <UniqueIdentifier>{d797b8db-871b-42f5-8418-907f97177aa5}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{472600f8-cf4a-4175-a3d2-827529fb3cc6}</UniqueIdentifier>
+      <UniqueIdentifier>{347c5bb3-bf73-472c-816a-d9022bd7f9e5}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{304f67f1-356f-4a66-bc35-ff8024e9fbb2}</UniqueIdentifier>
+      <UniqueIdentifier>{319f8e20-f290-49b0-9e7e-4430d4e294a8}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters
+++ b/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="PostgreSQL">
-      <UniqueIdentifier>{1e189d0a-1611-4560-9bef-f9919762d57b}</UniqueIdentifier>
+      <UniqueIdentifier>{98d956cf-4928-47fe-a4ef-2e36bf0729d6}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Header Files">
-      <UniqueIdentifier>{1481426b-9c61-4fb7-b4b2-0d4392c96fbf}</UniqueIdentifier>
+      <UniqueIdentifier>{8144d47d-8d69-418b-a61f-a42d0a737c8d}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Source Files">
-      <UniqueIdentifier>{d539313b-9073-4bdf-949c-50c42c8b2f1c}</UniqueIdentifier>
+      <UniqueIdentifier>{758a1711-b334-4a08-a694-0432439ff724}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{b048f657-7523-49f9-9cd8-2c66c235c6a5}</UniqueIdentifier>
+      <UniqueIdentifier>{0a4ae524-8f9d-472a-9bf6-871db416de03}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{3dbf1d2c-91fa-44b1-83f3-840d0fe6cdc5}</UniqueIdentifier>
+      <UniqueIdentifier>{cf7b283b-e08b-4672-aceb-7b069b8b1309}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{75699732-bb6d-4562-9681-ffcf99b6e495}</UniqueIdentifier>
+      <UniqueIdentifier>{6fa6b3fd-95d3-40c8-aad0-98d7c6bc8301}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{3ed07339-c31b-465b-8eb9-e8f5889c982a}</UniqueIdentifier>
+      <UniqueIdentifier>{8fda4ee2-08e6-42ab-a3bc-146d675bec93}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{a7b300fe-7013-4e93-b307-5e93f569df94}</UniqueIdentifier>
+      <UniqueIdentifier>{e9a8e060-0036-4746-9d05-a2712e4ecf51}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj
+++ b/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj
@@ -114,7 +114,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -132,7 +132,7 @@
      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -150,7 +150,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -166,7 +166,7 @@
      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -180,7 +180,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -198,10 +198,10 @@
      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
@@ -217,7 +217,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -233,10 +233,10 @@
      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>nafxcw.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>false</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
@@ -248,7 +248,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -266,7 +266,7 @@
      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -284,7 +284,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -300,7 +300,7 @@
      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
--- a/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj.filters
+++ b/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="PostgreSQL">
-      <UniqueIdentifier>{ce0eb972-c360-430d-9c6e-6601aa09d52e}</UniqueIdentifier>
+      <UniqueIdentifier>{5d94b527-dbf2-4792-aa79-3755c891c37f}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Header Files">
-      <UniqueIdentifier>{528344c2-d0b0-4d71-a997-426890b76f7c}</UniqueIdentifier>
+      <UniqueIdentifier>{2051b3db-f525-4c44-bc80-d91c1a3bb35a}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Source Files">
-      <UniqueIdentifier>{c2ce0849-761a-4c25-8009-055b8aeb417a}</UniqueIdentifier>
+      <UniqueIdentifier>{9bb97fea-d5d4-4ec9-9dc2-41a8bf9ea207}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{6fd61c8c-aea6-4bd8-8d6b-74b559e87361}</UniqueIdentifier>
+      <UniqueIdentifier>{eaf0c411-0d28-4f1d-bdde-7a128552c51c}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{a7112ebb-e6d4-470e-950a-28480d5d8e19}</UniqueIdentifier>
+      <UniqueIdentifier>{51c4f39a-b506-4e48-9f5f-5be90e40ba31}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{2a67f8f0-8df2-42ac-8f0f-4f85b89abf90}</UniqueIdentifier>
+      <UniqueIdentifier>{903b5caf-6b6c-4448-825b-0ef7083b59aa}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{141d467b-cff1-48c8-bdff-42608eb3a468}</UniqueIdentifier>
+      <UniqueIdentifier>{530307ca-49c6-484a-b5d1-b0eaf5b0d779}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{334c9472-10ee-445d-9457-f3d0c595ff52}</UniqueIdentifier>
+      <UniqueIdentifier>{82d55ecd-3d28-4e33-84b5-8c8db20b6b87}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj
+++ b/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj
@@ -132,7 +132,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -148,6 +148,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -164,7 +165,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -178,6 +179,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -190,7 +192,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -206,9 +208,10 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
@@ -223,7 +226,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -237,9 +240,10 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>nafxcw.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>false</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
@@ -250,7 +254,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -266,6 +270,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -282,7 +287,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -296,6 +301,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
--- a/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj.filters
+++ b/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="PostgreSQL">
-      <UniqueIdentifier>{a79d3243-c385-4bcf-ae73-5a2138444b5c}</UniqueIdentifier>
+      <UniqueIdentifier>{454ed352-806f-4de1-b8af-d8f42dbc9fc4}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Header Files">
-      <UniqueIdentifier>{36839382-8e7f-4df7-9d18-716d4ed70949}</UniqueIdentifier>
+      <UniqueIdentifier>{135c8aaf-911c-41b9-aeb9-a0dfc83e1b38}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Source Files">
-      <UniqueIdentifier>{134bfdb6-c5b3-4dff-a554-c001e28ed498}</UniqueIdentifier>
+      <UniqueIdentifier>{55a05bcd-e6cd-4c28-814c-8fa66ed005f0}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{e4e38cf3-2ef5-4f5b-a4e1-a0f22c901daa}</UniqueIdentifier>
+      <UniqueIdentifier>{ba9d1c1b-2bb9-4ab8-bab4-5aa7726f8444}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{7fd7f91a-baf7-40c1-829a-c5fcd04766f2}</UniqueIdentifier>
+      <UniqueIdentifier>{25134a7d-cb2d-43eb-853d-c13bad503d87}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{038ac280-2992-43ed-ba21-9d738d599335}</UniqueIdentifier>
+      <UniqueIdentifier>{026ef01f-3bd1-4cbd-b121-29a2ca61be04}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{a079540e-6d4c-44a1-a892-db654392bf10}</UniqueIdentifier>
+      <UniqueIdentifier>{f69b8936-f3fe-4f43-853c-b6807ed73561}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{ea6dd4b5-b27d-4864-bae4-db5da469f356}</UniqueIdentifier>
+      <UniqueIdentifier>{c298c3a3-eb6d-45a3-b2a3-c77ef9c3210c}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj
+++ b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj
@@ -126,7 +126,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -142,6 +142,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -158,7 +159,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -172,6 +173,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -184,7 +186,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -200,6 +202,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -216,7 +219,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -230,6 +233,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -242,7 +246,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -258,6 +262,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -274,7 +279,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -288,6 +293,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
--- a/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj.filters
+++ b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="PostgreSQL">
-      <UniqueIdentifier>{feb4c82a-4592-4477-b9e5-d48d55b13df8}</UniqueIdentifier>
+      <UniqueIdentifier>{9362f5bb-556a-4d4a-a3e8-97e6eae687b7}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Header Files">
-      <UniqueIdentifier>{d779829a-5acf-4a94-a7ab-c0dc2ad45c08}</UniqueIdentifier>
+      <UniqueIdentifier>{6653f087-c2c6-48e3-a7f1-6a8ea220aea3}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Source Files">
-      <UniqueIdentifier>{66804ce6-5013-49ba-a2a5-c67f0521ee72}</UniqueIdentifier>
+      <UniqueIdentifier>{d52828a5-b16e-4aec-9686-d9f164853df7}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{58f534d8-0441-4133-8f44-6b4f7cd1f963}</UniqueIdentifier>
+      <UniqueIdentifier>{4cb76cae-5fbc-4594-b2d0-1f19e86687bf}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{38d7cb33-5b9f-4c7f-b042-a59a305f3b95}</UniqueIdentifier>
+      <UniqueIdentifier>{6f604038-353e-47b1-bd42-c3be8cd47b6c}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{ed44a0ac-ef8e-40e4-b502-96b6c5e8a168}</UniqueIdentifier>
+      <UniqueIdentifier>{b1ee01c6-4ee9-47e8-8dff-ee083b48f046}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{ec2b70e5-7520-45c6-b64e-4ecd617f1c10}</UniqueIdentifier>
+      <UniqueIdentifier>{d37dcd2a-3195-47c2-b445-c784787d86a4}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{40802448-f4e0-4a8a-91ab-a6bc073ca61b}</UniqueIdentifier>
+      <UniqueIdentifier>{c52f1cee-2bdd-413e-8057-972e002e59be}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj
+++ b/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj
@@ -126,7 +126,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -142,6 +142,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -158,7 +159,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -172,6 +173,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -184,7 +186,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -200,6 +202,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -216,7 +219,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -230,6 +233,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -242,7 +246,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -258,6 +262,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -274,7 +279,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -288,6 +293,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
--- a/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj.filters
+++ b/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="PostgreSQL">
-      <UniqueIdentifier>{5bf43a25-d466-41a2-9e48-c60a568dd17a}</UniqueIdentifier>
+      <UniqueIdentifier>{ba5dedd4-3fb3-4274-ba99-46f4691430c8}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Header Files">
-      <UniqueIdentifier>{d1febb30-8cd9-4097-bef1-b855edb8037e}</UniqueIdentifier>
+      <UniqueIdentifier>{ca9f5fbf-5a8e-49e0-bb80-c1a30f66af94}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Source Files">
-      <UniqueIdentifier>{57e28629-cebc-4671-99fe-1eee7a6d97eb}</UniqueIdentifier>
+      <UniqueIdentifier>{240c5600-5dac-4f86-9dc6-65129a520b38}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{8522b809-2d22-4522-9e76-83c235e108bc}</UniqueIdentifier>
+      <UniqueIdentifier>{d7c5c9e5-5bab-41bd-856a-3fa4648484a0}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{ae2ae580-dee5-450e-8110-095f770d33ba}</UniqueIdentifier>
+      <UniqueIdentifier>{d7534325-5c94-494d-bda2-8b25493289a2}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{c68a9488-ddc8-4ce3-a125-4a5fe135fee0}</UniqueIdentifier>
+      <UniqueIdentifier>{e0d23e84-3902-47a4-b4a6-c48caf5b1b57}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{b180345c-b75d-4339-993a-eba2a379ed02}</UniqueIdentifier>
+      <UniqueIdentifier>{2f0a292f-46e5-4de2-8a87-3d809a39fa16}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{feae5d72-ec3d-47b8-9767-6803d2e6c902}</UniqueIdentifier>
+      <UniqueIdentifier>{a815518a-5ed3-4676-914b-80824ed3aeff}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj
+++ b/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj
@@ -126,7 +126,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -142,6 +142,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -158,7 +159,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -172,6 +173,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -184,7 +186,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -200,6 +202,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -216,7 +219,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -230,6 +233,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -242,7 +246,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -258,6 +262,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -274,7 +279,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -288,6 +293,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
--- a/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj.filters
+++ b/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="PostgreSQL">
-      <UniqueIdentifier>{8a73f8cd-1669-416b-882b-ac5b65a6fd3f}</UniqueIdentifier>
+      <UniqueIdentifier>{13dc58a4-8524-4c7b-aeaa-a5700f4a5cb2}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Header Files">
-      <UniqueIdentifier>{608b489f-dd52-41b3-9df0-23a7a432141b}</UniqueIdentifier>
+      <UniqueIdentifier>{5b23162e-6b97-4996-92a2-2bc19c979be3}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Source Files">
-      <UniqueIdentifier>{ae234ca9-6cf8-404a-a271-ba229fb47399}</UniqueIdentifier>
+      <UniqueIdentifier>{56cc42c9-d57c-4d78-830f-7621c7601603}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{b673792d-eb33-4c50-a4bf-6422616ae3cf}</UniqueIdentifier>
+      <UniqueIdentifier>{83065397-cfe7-41ef-ae77-eb56e8dba7ad}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{27d0cab6-39d5-436f-aff8-85b8cf443759}</UniqueIdentifier>
+      <UniqueIdentifier>{ce5fba18-072f-4831-9752-18147b820f00}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{2ffd9064-e775-4d11-8acf-4e8595f67e94}</UniqueIdentifier>
+      <UniqueIdentifier>{4df6429b-ddfe-42b7-9945-0c393df671ca}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{fbbd755c-578f-45b1-9ee3-ca9e5018c54b}</UniqueIdentifier>
+      <UniqueIdentifier>{2e9b300d-a975-415b-a1aa-8803f52be86c}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{5b1af651-332e-4ac2-b87c-f417052d06ef}</UniqueIdentifier>
+      <UniqueIdentifier>{c45d700a-0e33-4e4b-86f4-f5601ea5117f}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj
+++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj
@@ -114,7 +114,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -132,7 +132,7 @@
      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -150,7 +150,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -166,7 +166,7 @@
      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -180,7 +180,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -198,10 +198,10 @@
      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
@@ -217,7 +217,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -233,10 +233,10 @@
      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>nafxcw.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>false</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
@@ -248,7 +248,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -266,7 +266,7 @@
      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -284,7 +284,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -300,7 +300,7 @@
      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
--- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj.filters
+++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="PostgreSQL">
-      <UniqueIdentifier>{5fb68052-7f51-4cca-af3b-661bd9ed6676}</UniqueIdentifier>
+      <UniqueIdentifier>{88b8f5f6-b64b-437a-99c8-ab9ef9af6125}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Header Files">
-      <UniqueIdentifier>{71dc0928-3c72-4f6a-9b30-681156934322}</UniqueIdentifier>
+      <UniqueIdentifier>{f480da46-f05a-443f-8029-66e16ed994c0}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Source Files">
-      <UniqueIdentifier>{7d28ac5a-7e9c-4875-aaa1-f7606bb0c6df}</UniqueIdentifier>
+      <UniqueIdentifier>{baf669e6-25ba-4ddf-b1a4-55660bda57b9}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{15733f0c-d4c7-4dc9-b447-07dea14c4658}</UniqueIdentifier>
+      <UniqueIdentifier>{0409b23b-478b-4fdb-9cce-6c0da6d5df3d}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{850d74a8-cccc-4daf-8fa0-1352b57d7a50}</UniqueIdentifier>
+      <UniqueIdentifier>{3bc9340d-8f48-4199-b2b3-576e242e113d}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{a693f23f-2570-4a69-93fb-9fc89e23a097}</UniqueIdentifier>
+      <UniqueIdentifier>{32f1ddbc-212b-4f23-95c3-870d9df6f98d}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{5aae364b-f9c1-43c4-aab8-eb5f57ef788c}</UniqueIdentifier>
+      <UniqueIdentifier>{1808928f-6f62-4e0b-80de-31178d211d92}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{cdbee3ab-48ef-460f-9c70-69d7a0c9c741}</UniqueIdentifier>
+      <UniqueIdentifier>{be71cae2-0232-4296-bd16-204739c301fe}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj
+++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj
@@ -132,7 +132,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -148,6 +148,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -164,7 +165,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -178,6 +179,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -190,7 +192,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -206,9 +208,10 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
@@ -223,7 +226,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -237,9 +240,10 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>nafxcw.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>false</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
@@ -250,7 +254,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -266,6 +270,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -282,7 +287,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -296,6 +301,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
--- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj.filters
+++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="PostgreSQL">
-      <UniqueIdentifier>{83016003-f6b1-4b64-b6f2-5f7783795071}</UniqueIdentifier>
+      <UniqueIdentifier>{199f321f-b470-44ee-ba83-d9ed1dc50f6d}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Header Files">
-      <UniqueIdentifier>{59a04cbb-baa1-4e12-851d-9fd245b25577}</UniqueIdentifier>
+      <UniqueIdentifier>{f51acbd4-9ec3-44e6-824f-e1c8a807d168}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Source Files">
-      <UniqueIdentifier>{75ad78ed-13bc-489a-80c5-896b11035828}</UniqueIdentifier>
+      <UniqueIdentifier>{70d8eb2f-4f6e-4e20-b883-adf271524589}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{4a677a30-277d-4bbc-9038-3e3210dabb64}</UniqueIdentifier>
+      <UniqueIdentifier>{9895aafd-95c0-4470-ab91-550360807856}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{8da4e3ba-8411-4733-bd04-c6952df36336}</UniqueIdentifier>
+      <UniqueIdentifier>{ff9191d8-1e74-4c73-8203-b349df3d35f3}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{6c8e1f25-4038-416f-8133-e72c91642723}</UniqueIdentifier>
+      <UniqueIdentifier>{65c39a15-fe41-4e54-85d3-ed4722eb81e9}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{199adccd-7fb0-4b73-be14-887dcb56f0b7}</UniqueIdentifier>
+      <UniqueIdentifier>{85f32de4-429b-4bdc-b6fd-68dadb7ea753}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{6383d8b0-df4f-49f7-950b-3190c7528fd9}</UniqueIdentifier>
+      <UniqueIdentifier>{841fad99-6e2c-4860-9eee-5ed341016f57}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj
+++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj
@@ -126,7 +126,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -142,6 +142,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -158,7 +159,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -172,6 +173,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -184,7 +186,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -200,6 +202,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -216,7 +219,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -230,6 +233,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -242,7 +246,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -258,6 +262,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -274,7 +279,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -288,6 +293,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
--- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj.filters
+++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="PostgreSQL">
-      <UniqueIdentifier>{fc04cd71-7a46-40b2-8033-278c71f9c0eb}</UniqueIdentifier>
+      <UniqueIdentifier>{e6799cf1-ca48-4427-92e6-d58b6918367c}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Header Files">
-      <UniqueIdentifier>{a01babaf-a3da-41ea-a8f0-bd12e3a34e8c}</UniqueIdentifier>
+      <UniqueIdentifier>{580dde21-bc47-44ef-aab4-5a0cc67eb25b}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Source Files">
-      <UniqueIdentifier>{3ff32932-3f61-4ad8-9971-52b352205b63}</UniqueIdentifier>
+      <UniqueIdentifier>{e5dea2d7-cb51-40e5-9c71-f3853e02b91f}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{1b3fad52-bc5f-425e-b3b8-db1b33f38dc5}</UniqueIdentifier>
+      <UniqueIdentifier>{92568131-e169-4bcd-b81b-ca1709a22dfd}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{8828be15-1a37-4894-8941-1a23afdfd3ed}</UniqueIdentifier>
+      <UniqueIdentifier>{25c998de-bb91-4587-8dfb-6342acb72912}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{0eb95244-5273-42a5-b56d-0a55a1acb574}</UniqueIdentifier>
+      <UniqueIdentifier>{3c5889d2-cad5-454b-982b-85b103eb7272}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{a3cb3bd7-2337-4fcd-9b6f-32ad072488d5}</UniqueIdentifier>
+      <UniqueIdentifier>{e6e76036-c200-40a8-b6c2-593d253782d1}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{a175764f-ea94-4f78-a688-f9668934fb59}</UniqueIdentifier>
+      <UniqueIdentifier>{9f9a6551-4d62-42df-82a2-ae7f57caa280}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj
+++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj
@@ -126,7 +126,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -142,6 +142,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -158,7 +159,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -172,6 +173,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -184,7 +186,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -200,6 +202,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -216,7 +219,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -230,6 +233,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -242,7 +246,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -258,6 +262,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -274,7 +279,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -288,6 +293,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
--- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj.filters
+++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="PostgreSQL">
-      <UniqueIdentifier>{0d26f41e-fe38-4411-bd82-231e410bbefa}</UniqueIdentifier>
+      <UniqueIdentifier>{a2564dba-1196-4fe4-924f-b8d4923a67ff}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Header Files">
-      <UniqueIdentifier>{7f41bd15-73f6-4dbd-9d6c-e4cc22024d9c}</UniqueIdentifier>
+      <UniqueIdentifier>{7ad654d1-e6f5-43e6-b650-cf980ed7fbb8}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Source Files">
-      <UniqueIdentifier>{17b16324-4228-4737-b897-be62310e2d21}</UniqueIdentifier>
+      <UniqueIdentifier>{c4fe1efb-16f7-4e44-9e96-ee01cb0930ad}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{d4110d3d-27e0-4e5e-84c0-4bf199c3e3c6}</UniqueIdentifier>
+      <UniqueIdentifier>{8061d28a-aeaa-46e4-b3aa-eb810966470c}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{5038dbf9-a17d-4cc2-b744-b63ddea5f7ab}</UniqueIdentifier>
+      <UniqueIdentifier>{13a947d3-faa2-458c-ab07-a5760c7fbd89}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{809d7e27-cf4c-4ea0-b441-7938e6b82070}</UniqueIdentifier>
+      <UniqueIdentifier>{f4a9c5da-bdba-4b5a-80f2-4e73aa7444dd}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{7bd9a5f5-e347-4fb4-98ae-86d59911360c}</UniqueIdentifier>
+      <UniqueIdentifier>{566d12ba-9d70-4570-9bd2-5d86b3f9bd10}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{85401f09-072b-40d7-9519-909fdc7fefb8}</UniqueIdentifier>
+      <UniqueIdentifier>{9cf0a6a5-4b36-498a-942b-c53a961d0f34}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj
+++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj
@@ -126,7 +126,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -142,6 +142,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -158,7 +159,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -172,6 +173,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -184,7 +186,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -200,6 +202,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -216,7 +219,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -230,6 +233,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -242,7 +246,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
@@ -258,6 +262,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -274,7 +279,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -288,6 +293,7 @@
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
--- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj.filters
+++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="PostgreSQL">
-      <UniqueIdentifier>{b973d4c6-8604-42ea-93d6-91fc9cd2d23c}</UniqueIdentifier>
+      <UniqueIdentifier>{d4426045-d228-4e36-89e9-b5f608fa7bba}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Header Files">
-      <UniqueIdentifier>{5ea1ea1d-a003-4dce-b603-c1f1960907fa}</UniqueIdentifier>
+      <UniqueIdentifier>{be2568f9-4a4c-43a3-ae6b-ef9bf82023b2}</UniqueIdentifier>
    </Filter>
    <Filter Include="PostgreSQL\Source Files">
-      <UniqueIdentifier>{ae38f324-2d07-4af3-994d-63b5b14f43f4}</UniqueIdentifier>
+      <UniqueIdentifier>{2c25a4a3-2340-45d1-9456-fbd8f2191388}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{e4d1e6c4-a175-46ee-aa49-1bcd135080f5}</UniqueIdentifier>
+      <UniqueIdentifier>{5e583d42-297e-491d-87ce-397e60320ef7}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{bb71e23c-af79-40ea-90be-8f909f84eb9f}</UniqueIdentifier>
+      <UniqueIdentifier>{7bfcf1d8-e404-4688-b678-92fdf60abd62}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{185ba33d-f134-4ad4-ba30-797b714c58d7}</UniqueIdentifier>
+      <UniqueIdentifier>{19266d0f-3167-48e0-9864-05da7e726fb3}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{9a6edfa1-1ab5-4ef0-b61b-c799ba2c99b6}</UniqueIdentifier>
+      <UniqueIdentifier>{183c6169-c689-40b9-8cbb-e72b0b62dd4a}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{9a1bedfe-f41b-42c6-a183-4e8f428e7cec}</UniqueIdentifier>
+      <UniqueIdentifier>{5220feb6-f96e-4390-8473-5f57792ae613}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs90.vcproj
+++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs90.vcproj
@@ -32,7 +32,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
+				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -57,7 +57,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin64\TestSuited.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib64"
@@ -106,7 +106,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
+				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -129,7 +129,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin64\TestSuite.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib64"
@@ -174,7 +174,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
+				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -199,7 +199,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin64\static_mt\TestSuited.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib64"
@@ -249,7 +249,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
+				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -272,7 +272,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin64\static_mt\TestSuite.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib64"
@@ -318,7 +318,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
+				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -343,7 +343,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin64\static_md\TestSuited.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib64"
@@ -392,7 +392,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
+				AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -415,7 +415,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin64\static_md\TestSuite.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib64"