diff --git a/Net/testsuite/TestSuite_vs100.vcxproj b/Net/testsuite/TestSuite_vs100.vcxproj
index e821175ce..37e42c737 100644
--- a/Net/testsuite/TestSuite_vs100.vcxproj
+++ b/Net/testsuite/TestSuite_vs100.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="debug_shared|Win32">
@@ -32,90 +32,90 @@
     <RootNamespace>TestSuite</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
+  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
+  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
+  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
+  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
+  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
+  <ImportGroup Label="ExtensionSettings"/>
+  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;" Label="PropertySheets">
+    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;" Label="PropertySheets">
+    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;" Label="PropertySheets">
+    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;" Label="PropertySheets">
+    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;" Label="PropertySheets">
+    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;" Label="PropertySheets">
+    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">bin\static_mt\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">bin\static_mt\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">bin\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">bin\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">TestSuite</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">TestSuite</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">TestSuite</TargetName>
+    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">bin\</OutDir>
+    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">true</LinkIncremental>
+    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">bin\</OutDir>
+    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">false</LinkIncremental>
+    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">bin\static_mt\</OutDir>
+    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">true</LinkIncremental>
+    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">bin\static_mt\</OutDir>
+    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">false</LinkIncremental>
+    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">bin\static_md\</OutDir>
+    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">true</LinkIncremental>
+    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">bin\static_md\</OutDir>
+    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">false</LinkIncremental>
+    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">TestSuited</TargetName>
+    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">TestSuited</TargetName>
+    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">TestSuited</TargetName>
+    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">TestSuite</TargetName>
+    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">TestSuite</TargetName>
+    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">TestSuite</TargetName>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
+  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>POCO_HAVE_IPv6;WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -124,7 +124,7 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader />
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
@@ -141,7 +141,7 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
+  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -149,16 +149,16 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>POCO_HAVE_IPv6;WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader />
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat />
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -173,11 +173,11 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
+  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>POCO_HAVE_IPv6;WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -186,7 +186,7 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader />
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
@@ -204,7 +204,7 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
+  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -212,16 +212,16 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>POCO_HAVE_IPv6;WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader />
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat />
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -237,11 +237,11 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
+  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>POCO_HAVE_IPv6;WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -250,7 +250,7 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader />
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
@@ -267,7 +267,7 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
+  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -275,16 +275,16 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>POCO_HAVE_IPv6;WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader />
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat />
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -300,120 +300,120 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="src\DNSTest.h" />
-    <ClInclude Include="src\IPAddressTest.h" />
-    <ClInclude Include="src\NetCoreTestSuite.h" />
-    <ClInclude Include="src\SocketAddressTest.h" />
-    <ClInclude Include="src\NetTestSuite.h" />
-    <ClInclude Include="src\DatagramSocketTest.h" />
-    <ClInclude Include="src\DialogServer.h" />
-    <ClInclude Include="src\DialogSocketTest.h" />
-    <ClInclude Include="src\EchoServer.h" />
-    <ClInclude Include="src\MulticastEchoServer.h" />
-    <ClInclude Include="src\MulticastSocketTest.h" />
-    <ClInclude Include="src\NetworkInterfaceTest.h" />
-    <ClInclude Include="src\RawSocketTest.h" />
-    <ClInclude Include="src\SocketsTestSuite.h" />
-    <ClInclude Include="src\SocketStreamTest.h" />
-    <ClInclude Include="src\SocketTest.h" />
-    <ClInclude Include="src\UDPEchoServer.h" />
-    <ClInclude Include="src\MediaTypeTest.h" />
-    <ClInclude Include="src\MessageHeaderTest.h" />
-    <ClInclude Include="src\MessagesTestSuite.h" />
-    <ClInclude Include="src\MultipartReaderTest.h" />
-    <ClInclude Include="src\MultipartWriterTest.h" />
-    <ClInclude Include="src\NameValueCollectionTest.h" />
-    <ClInclude Include="src\QuotedPrintableTest.h" />
-    <ClInclude Include="src\HTTPCookieTest.h" />
-    <ClInclude Include="src\HTTPCredentialsTest.h" />
-    <ClInclude Include="src\HTTPRequestTest.h" />
-    <ClInclude Include="src\HTTPResponseTest.h" />
-    <ClInclude Include="src\HTTPTestServer.h" />
-    <ClInclude Include="src\HTTPTestSuite.h" />
-    <ClInclude Include="src\TCPServerTest.h" />
-    <ClInclude Include="src\TCPServerTestSuite.h" />
-    <ClInclude Include="src\HTTPServerTest.h" />
-    <ClInclude Include="src\HTTPServerTestSuite.h" />
-    <ClInclude Include="src\HTMLFormTest.h" />
-    <ClInclude Include="src\HTMLTestSuite.h" />
-    <ClInclude Include="src\HTTPClientSessionTest.h" />
-    <ClInclude Include="src\HTTPClientTestSuite.h" />
-    <ClInclude Include="src\HTTPStreamFactoryTest.h" />
-    <ClInclude Include="src\FTPClientSessionTest.h" />
-    <ClInclude Include="src\FTPClientTestSuite.h" />
-    <ClInclude Include="src\FTPStreamFactoryTest.h" />
-    <ClInclude Include="src\ReactorTestSuite.h" />
-    <ClInclude Include="src\SocketReactorTest.h" />
-    <ClInclude Include="src\MailMessageTest.h" />
-    <ClInclude Include="src\MailStreamTest.h" />
-    <ClInclude Include="src\MailTestSuite.h" />
-    <ClInclude Include="src\POP3ClientSessionTest.h" />
-    <ClInclude Include="src\SMTPClientSessionTest.h" />
-    <ClInclude Include="src\ICMPClientTest.h" />
-    <ClInclude Include="src\ICMPClientTestSuite.h" />
-    <ClInclude Include="src\ICMPSocketTest.h" />
-    <ClInclude Include="src\SyslogTest.h" />
-    <ClInclude Include="src\WebSocketTest.h" />
-    <ClInclude Include="src\WebSocketTestSuite.h" />
+    <ClInclude Include="src\DNSTest.h"/>
+    <ClInclude Include="src\IPAddressTest.h"/>
+    <ClInclude Include="src\NetCoreTestSuite.h"/>
+    <ClInclude Include="src\NetworkInterfaceTest.h"/>
+    <ClInclude Include="src\SocketAddressTest.h"/>
+    <ClInclude Include="src\NetTestSuite.h"/>
+    <ClInclude Include="src\DatagramSocketTest.h"/>
+    <ClInclude Include="src\DialogServer.h"/>
+    <ClInclude Include="src\DialogSocketTest.h"/>
+    <ClInclude Include="src\EchoServer.h"/>
+    <ClInclude Include="src\MulticastEchoServer.h"/>
+    <ClInclude Include="src\MulticastSocketTest.h"/>
+    <ClInclude Include="src\RawSocketTest.h"/>
+    <ClInclude Include="src\SocketsTestSuite.h"/>
+    <ClInclude Include="src\SocketStreamTest.h"/>
+    <ClInclude Include="src\SocketTest.h"/>
+    <ClInclude Include="src\UDPEchoServer.h"/>
+    <ClInclude Include="src\MediaTypeTest.h"/>
+    <ClInclude Include="src\MessageHeaderTest.h"/>
+    <ClInclude Include="src\MessagesTestSuite.h"/>
+    <ClInclude Include="src\MultipartReaderTest.h"/>
+    <ClInclude Include="src\MultipartWriterTest.h"/>
+    <ClInclude Include="src\NameValueCollectionTest.h"/>
+    <ClInclude Include="src\QuotedPrintableTest.h"/>
+    <ClInclude Include="src\HTTPCookieTest.h"/>
+    <ClInclude Include="src\HTTPCredentialsTest.h"/>
+    <ClInclude Include="src\HTTPRequestTest.h"/>
+    <ClInclude Include="src\HTTPResponseTest.h"/>
+    <ClInclude Include="src\HTTPTestServer.h"/>
+    <ClInclude Include="src\HTTPTestSuite.h"/>
+    <ClInclude Include="src\TCPServerTest.h"/>
+    <ClInclude Include="src\TCPServerTestSuite.h"/>
+    <ClInclude Include="src\HTTPServerTest.h"/>
+    <ClInclude Include="src\HTTPServerTestSuite.h"/>
+    <ClInclude Include="src\HTMLFormTest.h"/>
+    <ClInclude Include="src\HTMLTestSuite.h"/>
+    <ClInclude Include="src\HTTPClientSessionTest.h"/>
+    <ClInclude Include="src\HTTPClientTestSuite.h"/>
+    <ClInclude Include="src\HTTPStreamFactoryTest.h"/>
+    <ClInclude Include="src\FTPClientSessionTest.h"/>
+    <ClInclude Include="src\FTPClientTestSuite.h"/>
+    <ClInclude Include="src\FTPStreamFactoryTest.h"/>
+    <ClInclude Include="src\ReactorTestSuite.h"/>
+    <ClInclude Include="src\SocketReactorTest.h"/>
+    <ClInclude Include="src\MailMessageTest.h"/>
+    <ClInclude Include="src\MailStreamTest.h"/>
+    <ClInclude Include="src\MailTestSuite.h"/>
+    <ClInclude Include="src\POP3ClientSessionTest.h"/>
+    <ClInclude Include="src\SMTPClientSessionTest.h"/>
+    <ClInclude Include="src\ICMPClientTest.h"/>
+    <ClInclude Include="src\ICMPClientTestSuite.h"/>
+    <ClInclude Include="src\ICMPSocketTest.h"/>
+    <ClInclude Include="src\SyslogTest.h"/>
+    <ClInclude Include="src\WebSocketTest.h"/>
+    <ClInclude Include="src\WebSocketTestSuite.h"/>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\DNSTest.cpp" />
-    <ClCompile Include="src\IPAddressTest.cpp" />
-    <ClCompile Include="src\NetCoreTestSuite.cpp" />
-    <ClCompile Include="src\SocketAddressTest.cpp" />
-    <ClCompile Include="src\NetTestSuite.cpp" />
-    <ClCompile Include="src\WinDriver.cpp" />
-    <ClCompile Include="src\DatagramSocketTest.cpp" />
-    <ClCompile Include="src\DialogServer.cpp" />
-    <ClCompile Include="src\DialogSocketTest.cpp" />
-    <ClCompile Include="src\EchoServer.cpp" />
-    <ClCompile Include="src\MulticastEchoServer.cpp" />
-    <ClCompile Include="src\MulticastSocketTest.cpp" />
-    <ClCompile Include="src\NetworkInterfaceTest.cpp" />
-    <ClCompile Include="src\RawSocketTest.cpp" />
-    <ClCompile Include="src\SocketsTestSuite.cpp" />
-    <ClCompile Include="src\SocketStreamTest.cpp" />
-    <ClCompile Include="src\SocketTest.cpp" />
-    <ClCompile Include="src\UDPEchoServer.cpp" />
-    <ClCompile Include="src\MediaTypeTest.cpp" />
-    <ClCompile Include="src\MessageHeaderTest.cpp" />
-    <ClCompile Include="src\MessagesTestSuite.cpp" />
-    <ClCompile Include="src\MultipartReaderTest.cpp" />
-    <ClCompile Include="src\MultipartWriterTest.cpp" />
-    <ClCompile Include="src\NameValueCollectionTest.cpp" />
-    <ClCompile Include="src\QuotedPrintableTest.cpp" />
-    <ClCompile Include="src\HTTPCookieTest.cpp" />
-    <ClCompile Include="src\HTTPCredentialsTest.cpp" />
-    <ClCompile Include="src\HTTPRequestTest.cpp" />
-    <ClCompile Include="src\HTTPResponseTest.cpp" />
-    <ClCompile Include="src\HTTPTestServer.cpp" />
-    <ClCompile Include="src\HTTPTestSuite.cpp" />
-    <ClCompile Include="src\TCPServerTest.cpp" />
-    <ClCompile Include="src\TCPServerTestSuite.cpp" />
-    <ClCompile Include="src\HTTPServerTest.cpp" />
-    <ClCompile Include="src\HTTPServerTestSuite.cpp" />
-    <ClCompile Include="src\HTMLFormTest.cpp" />
-    <ClCompile Include="src\HTMLTestSuite.cpp" />
-    <ClCompile Include="src\HTTPClientSessionTest.cpp" />
-    <ClCompile Include="src\HTTPClientTestSuite.cpp" />
-    <ClCompile Include="src\HTTPStreamFactoryTest.cpp" />
-    <ClCompile Include="src\FTPClientSessionTest.cpp" />
-    <ClCompile Include="src\FTPClientTestSuite.cpp" />
-    <ClCompile Include="src\FTPStreamFactoryTest.cpp" />
-    <ClCompile Include="src\ReactorTestSuite.cpp" />
-    <ClCompile Include="src\SocketReactorTest.cpp" />
-    <ClCompile Include="src\MailMessageTest.cpp" />
-    <ClCompile Include="src\MailStreamTest.cpp" />
-    <ClCompile Include="src\MailTestSuite.cpp" />
-    <ClCompile Include="src\POP3ClientSessionTest.cpp" />
-    <ClCompile Include="src\SMTPClientSessionTest.cpp" />
-    <ClCompile Include="src\ICMPClientTest.cpp" />
-    <ClCompile Include="src\ICMPClientTestSuite.cpp" />
-    <ClCompile Include="src\ICMPSocketTest.cpp" />
-    <ClCompile Include="src\SyslogTest.cpp" />
-    <ClCompile Include="src\WebSocketTest.cpp" />
-    <ClCompile Include="src\WebSocketTestSuite.cpp" />
+    <ClCompile Include="src\DNSTest.cpp"/>
+    <ClCompile Include="src\IPAddressTest.cpp"/>
+    <ClCompile Include="src\NetCoreTestSuite.cpp"/>
+    <ClCompile Include="src\NetworkInterfaceTest.cpp"/>
+    <ClCompile Include="src\SocketAddressTest.cpp"/>
+    <ClCompile Include="src\NetTestSuite.cpp"/>
+    <ClCompile Include="src\WinDriver.cpp"/>
+    <ClCompile Include="src\DatagramSocketTest.cpp"/>
+    <ClCompile Include="src\DialogServer.cpp"/>
+    <ClCompile Include="src\DialogSocketTest.cpp"/>
+    <ClCompile Include="src\EchoServer.cpp"/>
+    <ClCompile Include="src\MulticastEchoServer.cpp"/>
+    <ClCompile Include="src\MulticastSocketTest.cpp"/>
+    <ClCompile Include="src\RawSocketTest.cpp"/>
+    <ClCompile Include="src\SocketsTestSuite.cpp"/>
+    <ClCompile Include="src\SocketStreamTest.cpp"/>
+    <ClCompile Include="src\SocketTest.cpp"/>
+    <ClCompile Include="src\UDPEchoServer.cpp"/>
+    <ClCompile Include="src\MediaTypeTest.cpp"/>
+    <ClCompile Include="src\MessageHeaderTest.cpp"/>
+    <ClCompile Include="src\MessagesTestSuite.cpp"/>
+    <ClCompile Include="src\MultipartReaderTest.cpp"/>
+    <ClCompile Include="src\MultipartWriterTest.cpp"/>
+    <ClCompile Include="src\NameValueCollectionTest.cpp"/>
+    <ClCompile Include="src\QuotedPrintableTest.cpp"/>
+    <ClCompile Include="src\HTTPCookieTest.cpp"/>
+    <ClCompile Include="src\HTTPCredentialsTest.cpp"/>
+    <ClCompile Include="src\HTTPRequestTest.cpp"/>
+    <ClCompile Include="src\HTTPResponseTest.cpp"/>
+    <ClCompile Include="src\HTTPTestServer.cpp"/>
+    <ClCompile Include="src\HTTPTestSuite.cpp"/>
+    <ClCompile Include="src\TCPServerTest.cpp"/>
+    <ClCompile Include="src\TCPServerTestSuite.cpp"/>
+    <ClCompile Include="src\HTTPServerTest.cpp"/>
+    <ClCompile Include="src\HTTPServerTestSuite.cpp"/>
+    <ClCompile Include="src\HTMLFormTest.cpp"/>
+    <ClCompile Include="src\HTMLTestSuite.cpp"/>
+    <ClCompile Include="src\HTTPClientSessionTest.cpp"/>
+    <ClCompile Include="src\HTTPClientTestSuite.cpp"/>
+    <ClCompile Include="src\HTTPStreamFactoryTest.cpp"/>
+    <ClCompile Include="src\FTPClientSessionTest.cpp"/>
+    <ClCompile Include="src\FTPClientTestSuite.cpp"/>
+    <ClCompile Include="src\FTPStreamFactoryTest.cpp"/>
+    <ClCompile Include="src\ReactorTestSuite.cpp"/>
+    <ClCompile Include="src\SocketReactorTest.cpp"/>
+    <ClCompile Include="src\MailMessageTest.cpp"/>
+    <ClCompile Include="src\MailStreamTest.cpp"/>
+    <ClCompile Include="src\MailTestSuite.cpp"/>
+    <ClCompile Include="src\POP3ClientSessionTest.cpp"/>
+    <ClCompile Include="src\SMTPClientSessionTest.cpp"/>
+    <ClCompile Include="src\ICMPClientTest.cpp"/>
+    <ClCompile Include="src\ICMPClientTestSuite.cpp"/>
+    <ClCompile Include="src\ICMPSocketTest.cpp"/>
+    <ClCompile Include="src\SyslogTest.cpp"/>
+    <ClCompile Include="src\WebSocketTest.cpp"/>
+    <ClCompile Include="src\WebSocketTestSuite.cpp"/>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
+  <ImportGroup Label="ExtensionTargets"/>
+</Project>
diff --git a/Net/testsuite/TestSuite_vs100.vcxproj.filters b/Net/testsuite/TestSuite_vs100.vcxproj.filters
index d63aaab51..4a05123ce 100644
--- a/Net/testsuite/TestSuite_vs100.vcxproj.filters
+++ b/Net/testsuite/TestSuite_vs100.vcxproj.filters
@@ -2,145 +2,145 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{045ec2ce-7ce1-4ef4-8c6f-c579dd9173dc}</UniqueIdentifier>
+      <UniqueIdentifier>{62176d03-dd93-4c21-961c-6a8de91c80fc}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{3cd956fc-7bfb-40f7-8102-f26d3d28fdce}</UniqueIdentifier>
+      <UniqueIdentifier>{be8df3e4-0cba-4942-93dc-b78936a168e8}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{f5391f18-0dd7-4b47-895a-82cdb2e472e9}</UniqueIdentifier>
+      <UniqueIdentifier>{82c39bf9-8483-4d2a-bd75-b18c17b0cbeb}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{b7f43f5f-628c-430e-abea-e2c3c6fd6be7}</UniqueIdentifier>
+      <UniqueIdentifier>{456ebe13-7207-4b26-b152-02c875513fca}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{d99ce02a-44e1-4d4d-8bdc-81ab6168dbb5}</UniqueIdentifier>
+      <UniqueIdentifier>{a1c86e4a-e011-475a-b799-96d504c132bf}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{b39f89fe-492a-4658-8cfe-78246af4baf6}</UniqueIdentifier>
+      <UniqueIdentifier>{2bbdf533-5e16-466e-b8fa-2b3cd6a93c7a}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{ed187333-e0d6-45f8-b5b1-a3af874f5355}</UniqueIdentifier>
+      <UniqueIdentifier>{d2d284f3-7e42-489c-bd53-a03bd03b44a0}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{4a8d0002-1158-4be6-a085-b9232d1880ea}</UniqueIdentifier>
+      <UniqueIdentifier>{db417de8-cc21-4e60-be9e-945c4d7401c5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{25dd152a-a82e-4920-a74e-1dc7b1be6867}</UniqueIdentifier>
+      <UniqueIdentifier>{ed84533c-050a-4273-886e-4b4ad511cbc8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{7edb4920-b353-4c0a-ac1c-4e3cc3a4d609}</UniqueIdentifier>
+      <UniqueIdentifier>{61b8c341-296e-4e7b-a43e-a53cf8598a5f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{1e0aedb1-d2ce-4e76-86b9-bb0afc95f2ba}</UniqueIdentifier>
+      <UniqueIdentifier>{560c45e0-bde4-48cf-b5b6-704013aa7855}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{6fd4fc3d-a8b4-4011-957c-95de97d86259}</UniqueIdentifier>
+      <UniqueIdentifier>{7d53f558-9ea2-4b68-8dcb-53dbc522931f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{e1805de8-d2bf-483f-93de-7614c1251c6f}</UniqueIdentifier>
+      <UniqueIdentifier>{40b29b20-7b4b-42eb-8dfb-986493596f73}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{eb9c3a66-9a39-42f7-a854-a9af0fe184b3}</UniqueIdentifier>
+      <UniqueIdentifier>{3f99b1d0-a5fc-4b1a-848d-9954975b4050}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{660b767a-9ed5-454f-90f4-249ab1e9cfea}</UniqueIdentifier>
+      <UniqueIdentifier>{8a37989b-8dce-4088-bd28-84f63d23dc96}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{b4e9b6dc-c4bb-4018-ade3-74617c15c116}</UniqueIdentifier>
+      <UniqueIdentifier>{f568cf07-8f46-448c-abbb-6fe2159f2467}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{84e7d886-802f-4b00-877e-bedd43e9c7b2}</UniqueIdentifier>
+      <UniqueIdentifier>{ab066cb1-3b39-42fe-add5-94da2d08a165}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{0809e84a-f2c4-4262-8cf5-ca8479a4dcf8}</UniqueIdentifier>
+      <UniqueIdentifier>{1f4d1408-f2ea-41ca-b96b-c51356819226}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{ec6fd465-8cea-47e8-846b-e11351eec9b3}</UniqueIdentifier>
+      <UniqueIdentifier>{ecf5b040-f8a8-4bef-8c2e-a21940bfbb95}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{28a652d8-b933-4528-a08a-43cce4f4a674}</UniqueIdentifier>
+      <UniqueIdentifier>{eba9ff6a-848a-479e-8df1-005fdcc18a84}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{cfcbb51a-9572-4572-abf8-f89fa6d8509f}</UniqueIdentifier>
+      <UniqueIdentifier>{03b17bbb-d62e-4921-bfb1-6f44b66f4a01}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{abedf1cf-cee5-4fe8-8dab-d73ce0f270ca}</UniqueIdentifier>
+      <UniqueIdentifier>{9623b156-79d5-45f8-8581-c879eba2c348}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{684427e7-4517-4765-b1ee-329b96f9e3f6}</UniqueIdentifier>
+      <UniqueIdentifier>{5f85c0a3-cee3-496b-b2c8-8d2ebe61a5d0}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{2231c54b-8555-4dca-abb5-827338ea04b9}</UniqueIdentifier>
+      <UniqueIdentifier>{4d5d5c36-7304-4d5a-9639-d60a49911d40}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{eec2ce89-d011-4300-bc02-0a8128150ae2}</UniqueIdentifier>
+      <UniqueIdentifier>{1b2dc8e6-c2c9-4637-a29c-6fe8445b37e9}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{cb4b7b7d-1a3f-422b-9918-54b6818437e1}</UniqueIdentifier>
+      <UniqueIdentifier>{cd611040-638d-4d8b-8235-42de4b15a165}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{6261e589-08d1-40ab-aa72-e33fa757b0d6}</UniqueIdentifier>
+      <UniqueIdentifier>{e97c947a-c92b-4a42-b57b-9854d67a1e92}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{034a40d5-d1a9-4a54-b68d-26bd4096369e}</UniqueIdentifier>
+      <UniqueIdentifier>{b19506e8-ea9b-49ff-83a3-90dce4bc6bad}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{f5a14705-0eae-4883-9a21-c717d8738efe}</UniqueIdentifier>
+      <UniqueIdentifier>{da4038c6-78e0-453b-8885-2bb9a42127e8}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{c538bcc8-9525-4435-b866-a86f612dbf7e}</UniqueIdentifier>
+      <UniqueIdentifier>{00ea4875-6c6e-4431-9121-072602112d23}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{62a3a1f3-71fa-42a9-bf56-5d1f7ae7c7e0}</UniqueIdentifier>
+      <UniqueIdentifier>{7a9bc732-bf04-4e8d-866e-8b1a2c54a66e}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{1e605517-05ab-479e-9f04-e2ba01c10bbd}</UniqueIdentifier>
+      <UniqueIdentifier>{bbba37de-8f51-43f1-969f-aa0ccc495551}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{d4e94ebc-292d-4b77-b705-cd93963d9fa0}</UniqueIdentifier>
+      <UniqueIdentifier>{1d4583a2-0266-4bad-9608-69d0cb189a78}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{108cae22-cd74-4057-9101-48c7f6b7f8e2}</UniqueIdentifier>
+      <UniqueIdentifier>{32a9e637-c7cb-49a0-9932-c3c4809c8152}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{efd15fbf-69fd-4825-be5d-c7e7cb2748ad}</UniqueIdentifier>
+      <UniqueIdentifier>{24b8526a-ab14-4ccb-b1c2-15000e46a132}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{0878b315-3f60-40a8-a4f2-b7463ea432de}</UniqueIdentifier>
+      <UniqueIdentifier>{eb124f6a-5b7b-4145-ab7e-56acad27eeb3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{b32a702e-404e-4676-90a6-cd69ae9bacc8}</UniqueIdentifier>
+      <UniqueIdentifier>{be99269a-a814-4b88-86aa-6fddeef5ac6f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{251b9f94-59bf-42c3-9edd-f6dae73b8a97}</UniqueIdentifier>
+      <UniqueIdentifier>{2523509f-efe2-4626-9667-0a45a09a601a}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{ef4ef18f-aaf2-428e-bcac-fed9ce11ba6d}</UniqueIdentifier>
+      <UniqueIdentifier>{d11b4a5b-8f46-4da8-a6e0-b5c48e7644d6}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{910bde8a-882f-41fb-b300-f8cb22ae6d72}</UniqueIdentifier>
+      <UniqueIdentifier>{6874993e-2b46-485d-87bd-f93fa9c80f86}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{b19d8468-6874-4c2c-a86e-513f7c9f849b}</UniqueIdentifier>
+      <UniqueIdentifier>{4dee954b-63ba-4ebc-8943-ecc387217711}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{5d8cbd04-1f8e-4c42-b72b-e0f5283d3fff}</UniqueIdentifier>
+      <UniqueIdentifier>{4f49f0d8-d31d-4aca-acba-3c14f0ab4178}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{643a6537-4323-4d09-8b39-85cb2927bbd3}</UniqueIdentifier>
+      <UniqueIdentifier>{a66caba3-e59e-4e1f-bdbd-2b5880a87eac}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{63049f7c-edbc-4e34-ae3a-aa479959703c}</UniqueIdentifier>
+      <UniqueIdentifier>{4873aa27-01fe-42ca-a76b-48a66a6e1d0a}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{a94bb0d2-0d01-4711-8a26-3b0f905079e0}</UniqueIdentifier>
+      <UniqueIdentifier>{bf010606-ad0a-4737-b8aa-e556f891e895}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{ff24e047-ed91-4c72-86e5-5aa290ab528c}</UniqueIdentifier>
+      <UniqueIdentifier>{3c5e1d5d-6c6c-419c-88e5-cc4064ff1b80}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{d1acd435-0ff4-42fd-b786-adc05f05725a}</UniqueIdentifier>
+      <UniqueIdentifier>{abe578db-9bd0-423d-a978-271d2f3c09b6}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -153,6 +153,9 @@
     <ClInclude Include="src\NetCoreTestSuite.h">
       <Filter>NetCore\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\NetworkInterfaceTest.h">
+      <Filter>NetCore\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\SocketAddressTest.h">
       <Filter>NetCore\Header Files</Filter>
     </ClInclude>
@@ -306,9 +309,6 @@
     <ClInclude Include="src\WebSocketTestSuite.h">
       <Filter>WebSocket\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\NetworkInterfaceTest.h">
-      <Filter>NetCore\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\DNSTest.cpp">
@@ -320,6 +320,9 @@
     <ClCompile Include="src\NetCoreTestSuite.cpp">
       <Filter>NetCore\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\NetworkInterfaceTest.cpp">
+      <Filter>NetCore\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\SocketAddressTest.cpp">
       <Filter>NetCore\Source Files</Filter>
     </ClCompile>
@@ -476,8 +479,5 @@
     <ClCompile Include="src\WebSocketTestSuite.cpp">
       <Filter>WebSocket\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\NetworkInterfaceTest.cpp">
-      <Filter>NetCore\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Net/testsuite/TestSuite_vs110.vcxproj b/Net/testsuite/TestSuite_vs110.vcxproj
index 2f25a4efc..51b038515 100644
--- a/Net/testsuite/TestSuite_vs110.vcxproj
+++ b/Net/testsuite/TestSuite_vs110.vcxproj
@@ -121,7 +121,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -155,7 +155,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -183,7 +183,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -218,7 +218,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -247,7 +247,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -281,7 +281,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
diff --git a/Net/testsuite/TestSuite_vs110.vcxproj.filters b/Net/testsuite/TestSuite_vs110.vcxproj.filters
index 72531de30..e08a1040a 100644
--- a/Net/testsuite/TestSuite_vs110.vcxproj.filters
+++ b/Net/testsuite/TestSuite_vs110.vcxproj.filters
@@ -2,145 +2,145 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{3ad05ed5-8111-43da-89bc-274929ca55e2}</UniqueIdentifier>
+      <UniqueIdentifier>{d3dc84b5-1e80-4a95-83eb-fa7723299f23}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{97f26fb4-bb93-48f6-a0a3-8027cc4e71c1}</UniqueIdentifier>
+      <UniqueIdentifier>{8c46d020-c224-49b9-a866-7c0aa937465b}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{57fc5b34-007e-46cf-a118-5f165e63fa8f}</UniqueIdentifier>
+      <UniqueIdentifier>{cff351eb-9ad9-41e4-ba48-c525d0448599}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{62d6ede7-2d6b-49db-a996-aa2cb6eb3fab}</UniqueIdentifier>
+      <UniqueIdentifier>{655499ac-497a-4fac-9b94-22a22b3ad1af}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{1ff60a30-aa39-48f6-be54-ae5453d7f8db}</UniqueIdentifier>
+      <UniqueIdentifier>{2e94b2b8-e746-41ad-ad43-2d24f42b3da2}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{a5a7a2e6-086a-4472-8ca8-30ffb800ecda}</UniqueIdentifier>
+      <UniqueIdentifier>{cefbf95a-ac06-4250-83d2-b7311c0551e8}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{2e3873ce-1329-4649-98b3-6b3e4d1d898c}</UniqueIdentifier>
+      <UniqueIdentifier>{d04e949b-351a-4acc-951f-42a855e13c80}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{356b8a00-80a6-4cf6-8f69-12093d89346b}</UniqueIdentifier>
+      <UniqueIdentifier>{2f9820f0-5cf2-4160-8f29-bcf607b9c39c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{817ef810-1111-4109-8def-70884e34a7c8}</UniqueIdentifier>
+      <UniqueIdentifier>{e0212a09-2005-41cf-9c06-d272a45704f7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{7b5c3a7a-a030-4d89-9363-a731a282c85c}</UniqueIdentifier>
+      <UniqueIdentifier>{0642ff40-9c03-4b19-95c7-74b8038645a5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{29f936d3-78a2-4fe9-b8cc-36bedc9a4675}</UniqueIdentifier>
+      <UniqueIdentifier>{20afa50e-d55d-482e-aaf7-74f95174af28}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{2bc7664b-c2d4-4857-908f-646f332d7c71}</UniqueIdentifier>
+      <UniqueIdentifier>{b68f6c40-e351-4756-b2ed-6ee69ef0c1ab}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{705bcb71-fa65-412c-bf2e-47dc5241f866}</UniqueIdentifier>
+      <UniqueIdentifier>{02eb4001-26c5-4e68-99c9-e578900ce114}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{02ddf677-f8ca-4557-a2ad-5c48ac87f3b8}</UniqueIdentifier>
+      <UniqueIdentifier>{520d1ead-968c-4f09-91db-2f8a5e13090d}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{78293946-3102-451d-a917-c49b11d8c2a0}</UniqueIdentifier>
+      <UniqueIdentifier>{21640349-7b81-4cd1-95dd-8eda4c402750}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{b9e32de1-2594-4e73-b934-5d6bc04df119}</UniqueIdentifier>
+      <UniqueIdentifier>{cd7dfd15-b142-43d5-a4d0-956b7a47c959}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{896270d3-22a1-4b0d-b960-b7f55b3b3288}</UniqueIdentifier>
+      <UniqueIdentifier>{8ce0cf17-3595-4738-b6cd-0c9230e3177c}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{17f32de5-f88c-4d68-a68b-aa592ce7fa4c}</UniqueIdentifier>
+      <UniqueIdentifier>{3e9cb556-d05d-4e54-aa66-2e534bc3a8db}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{239b1fd4-02db-4a7d-a8ca-8f947c58eec5}</UniqueIdentifier>
+      <UniqueIdentifier>{f84b04d8-0404-4752-9190-d1eee7cfe060}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{92641c6c-271c-412d-b0d0-017597c48500}</UniqueIdentifier>
+      <UniqueIdentifier>{f5bc8e48-9d52-43f1-ad1e-329cec29d5b5}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{c7d5a692-3af9-49f3-b28a-8e4606b45052}</UniqueIdentifier>
+      <UniqueIdentifier>{75e26830-ba67-48fb-a6f5-ba4c08e3fbf9}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{089cd206-cbb5-403a-bb36-3a5846b90433}</UniqueIdentifier>
+      <UniqueIdentifier>{2f23966a-02b5-4507-80f8-aa8ad7eafeef}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{6e9a9777-28a0-43bb-b370-dd31d5925cc9}</UniqueIdentifier>
+      <UniqueIdentifier>{e71ca7b7-1645-4770-85a7-fe3fdb42fe3f}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{9aecab5b-2953-4259-82f3-b64e2db5e86f}</UniqueIdentifier>
+      <UniqueIdentifier>{2c6be21b-d869-454c-a6fe-95a20d09be2a}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{3f17af85-89e1-4045-8b44-cb58736e09ff}</UniqueIdentifier>
+      <UniqueIdentifier>{4d94a464-47cc-4e12-8462-1e9c092907c3}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{8da6531d-ef52-46c5-8336-6fbe41bef387}</UniqueIdentifier>
+      <UniqueIdentifier>{5af8505f-db08-4700-974b-ba45fbb96bc3}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{e017449a-d987-4397-8f23-e16300c45a5e}</UniqueIdentifier>
+      <UniqueIdentifier>{cd5932f7-4208-4a92-bee5-9af8041e114c}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{c18741b0-a25e-4f3c-b9c8-84f00fc13391}</UniqueIdentifier>
+      <UniqueIdentifier>{1b3748c1-c5be-4de9-8621-f665f0276e96}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{8e087057-0157-4d8d-b23d-c5580cb8f2cb}</UniqueIdentifier>
+      <UniqueIdentifier>{ec394472-d9d2-459f-a230-9fead7a17956}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{181ac97c-cbd7-4838-8f18-a8568e05a4af}</UniqueIdentifier>
+      <UniqueIdentifier>{9fd19611-bb28-4b11-b91d-98a57a4c75ff}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{a1b30479-a4f7-46ea-a50c-22a6cd86ed38}</UniqueIdentifier>
+      <UniqueIdentifier>{94981c8c-2fa3-4398-8d0b-8d23b40b9738}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{a2b7199a-864c-4e91-bfc4-e9906fb17707}</UniqueIdentifier>
+      <UniqueIdentifier>{ef8e3305-bae0-44f9-85dc-da30b389e211}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{32543cf5-8a58-44d8-b268-96c07ca9d639}</UniqueIdentifier>
+      <UniqueIdentifier>{93dd8ac8-2966-4407-81ba-c9a3573d854a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{845e0bc7-2db5-48f7-9daa-c6314e202e8c}</UniqueIdentifier>
+      <UniqueIdentifier>{6fe0f414-0a1e-412b-ba4b-df1681bdc015}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{fb4f0840-bbd9-43bb-b5e4-3d34d2132d3b}</UniqueIdentifier>
+      <UniqueIdentifier>{e074da1d-139f-4cc5-a095-2a756b4ea3dd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{f31a0540-f42e-4ee3-8f30-1a468d5fdc54}</UniqueIdentifier>
+      <UniqueIdentifier>{385068f1-4986-4f77-8022-eaf2cbe794ba}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{78c105fc-611b-403c-9ad0-effbebbce3fe}</UniqueIdentifier>
+      <UniqueIdentifier>{5cf13351-f3ad-4cea-a81c-bae809b00e50}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{93f80225-46fe-47fe-ad34-4f0f5073937a}</UniqueIdentifier>
+      <UniqueIdentifier>{72e82059-c9c0-4cdc-ae0c-bc7cf7aee144}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{4ab2a184-8ba7-4418-938d-0b1e35019da6}</UniqueIdentifier>
+      <UniqueIdentifier>{bd0b443d-45a6-4abf-9c24-7c6294a141b6}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{49145799-1583-4ec0-9ec6-7cebfec428eb}</UniqueIdentifier>
+      <UniqueIdentifier>{82807d12-ba40-4f15-a339-8fe08ebcaddc}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{0090e475-c03c-49b1-937f-b935f526a558}</UniqueIdentifier>
+      <UniqueIdentifier>{accb26b9-c28e-4986-ae9d-8b154c85e1f1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{4640aa9e-713d-4879-9ec5-39f77f9f6391}</UniqueIdentifier>
+      <UniqueIdentifier>{ee8f5cc8-baa6-4835-8bf9-9dd3be7b5d69}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{263bec99-baff-461b-9362-d844e95b87de}</UniqueIdentifier>
+      <UniqueIdentifier>{ade00c8b-9675-4c12-90fb-6638aab5961d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{8a67e588-1eed-41d2-8d4b-96c5b2c88791}</UniqueIdentifier>
+      <UniqueIdentifier>{c9d78a35-0251-49e2-924d-99188519a988}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{4d642a50-2d4e-4c99-9fd0-2b33ee372083}</UniqueIdentifier>
+      <UniqueIdentifier>{6951e9cc-18dd-453f-acac-dee664956580}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{78a803f7-f940-46b3-b9a9-e569925bd589}</UniqueIdentifier>
+      <UniqueIdentifier>{11b8fa05-94fc-413d-99d1-2cdc1031f226}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{9ecea5a8-82b8-4b4c-8e81-d858890327a8}</UniqueIdentifier>
+      <UniqueIdentifier>{61483109-2b05-4d06-bfab-97b4b64fc268}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/Net/testsuite/TestSuite_vs71.vcproj b/Net/testsuite/TestSuite_vs71.vcproj
index 5c7179045..5fd5beecd 100644
--- a/Net/testsuite/TestSuite_vs71.vcproj
+++ b/Net/testsuite/TestSuite_vs71.vcproj
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;"
 				StringPooling="TRUE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -87,7 +87,7 @@
 				OmitFramePointers="TRUE"
 				OptimizeForWindowsApplication="TRUE"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="FALSE"
@@ -147,7 +147,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
 				StringPooling="TRUE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -213,7 +213,7 @@
 				OmitFramePointers="TRUE"
 				OptimizeForWindowsApplication="TRUE"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="FALSE"
@@ -274,7 +274,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
 				StringPooling="TRUE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -339,7 +339,7 @@
 				OmitFramePointers="TRUE"
 				OptimizeForWindowsApplication="TRUE"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="FALSE"
diff --git a/Net/testsuite/TestSuite_vs80.vcproj b/Net/testsuite/TestSuite_vs80.vcproj
index f3acf8f05..3b594b694 100644
--- a/Net/testsuite/TestSuite_vs80.vcproj
+++ b/Net/testsuite/TestSuite_vs80.vcproj
@@ -33,7 +33,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;"
 				StringPooling="true"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
@@ -171,7 +171,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="4"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
 				StringPooling="true"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -244,7 +244,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
@@ -311,7 +311,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="4"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
 				StringPooling="true"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -383,7 +383,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
diff --git a/Net/testsuite/TestSuite_vs90.vcproj b/Net/testsuite/TestSuite_vs90.vcproj
index c234c9fa0..08994ea59 100644
--- a/Net/testsuite/TestSuite_vs90.vcproj
+++ b/Net/testsuite/TestSuite_vs90.vcproj
@@ -33,7 +33,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;"
 				StringPooling="true"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
@@ -171,7 +171,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="4"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
 				StringPooling="true"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -244,7 +244,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
@@ -311,7 +311,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="4"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
 				StringPooling="true"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -383,7 +383,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
diff --git a/Net/testsuite/TestSuite_x64_vs100.vcxproj b/Net/testsuite/TestSuite_x64_vs100.vcxproj
index aa0973ad1..5ee4a98ff 100644
--- a/Net/testsuite/TestSuite_x64_vs100.vcxproj
+++ b/Net/testsuite/TestSuite_x64_vs100.vcxproj
@@ -115,7 +115,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -149,7 +149,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -177,7 +177,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -212,7 +212,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -241,7 +241,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -275,7 +275,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -303,6 +303,7 @@
     <ClInclude Include="src\DNSTest.h"/>
     <ClInclude Include="src\IPAddressTest.h"/>
     <ClInclude Include="src\NetCoreTestSuite.h"/>
+    <ClInclude Include="src\NetworkInterfaceTest.h"/>
     <ClInclude Include="src\SocketAddressTest.h"/>
     <ClInclude Include="src\NetTestSuite.h"/>
     <ClInclude Include="src\DatagramSocketTest.h"/>
@@ -311,7 +312,6 @@
     <ClInclude Include="src\EchoServer.h"/>
     <ClInclude Include="src\MulticastEchoServer.h"/>
     <ClInclude Include="src\MulticastSocketTest.h"/>
-    <ClInclude Include="src\NetworkInterfaceTest.h"/>
     <ClInclude Include="src\RawSocketTest.h"/>
     <ClInclude Include="src\SocketsTestSuite.h"/>
     <ClInclude Include="src\SocketStreamTest.h"/>
@@ -360,6 +360,7 @@
     <ClCompile Include="src\DNSTest.cpp"/>
     <ClCompile Include="src\IPAddressTest.cpp"/>
     <ClCompile Include="src\NetCoreTestSuite.cpp"/>
+    <ClCompile Include="src\NetworkInterfaceTest.cpp"/>
     <ClCompile Include="src\SocketAddressTest.cpp"/>
     <ClCompile Include="src\NetTestSuite.cpp"/>
     <ClCompile Include="src\WinDriver.cpp"/>
@@ -369,7 +370,6 @@
     <ClCompile Include="src\EchoServer.cpp"/>
     <ClCompile Include="src\MulticastEchoServer.cpp"/>
     <ClCompile Include="src\MulticastSocketTest.cpp"/>
-    <ClCompile Include="src\NetworkInterfaceTest.cpp"/>
     <ClCompile Include="src\RawSocketTest.cpp"/>
     <ClCompile Include="src\SocketsTestSuite.cpp"/>
     <ClCompile Include="src\SocketStreamTest.cpp"/>
diff --git a/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters
index ab3e30443..bf06348a6 100644
--- a/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters
+++ b/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters
@@ -2,145 +2,145 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{02e162b4-c1c4-4ddc-9c05-897a451d148c}</UniqueIdentifier>
+      <UniqueIdentifier>{6158122a-cb49-4e2a-bda0-759d6996811b}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{1d72b1e5-e180-4941-8e67-dfe90babd358}</UniqueIdentifier>
+      <UniqueIdentifier>{20bb4cea-ca93-432f-8c79-2186fbc8f671}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{2285b4d8-d072-43a2-9cfa-32177a674f31}</UniqueIdentifier>
+      <UniqueIdentifier>{1ea807a8-b737-4e8b-8c03-05cc246cc6a9}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{b18b94f5-5ddf-4dd1-ba36-caefbbf8b40c}</UniqueIdentifier>
+      <UniqueIdentifier>{dc791999-bd42-4b34-a596-cee1a25c766b}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{e234121f-97ba-4a8a-a56d-8cefa9fadc3f}</UniqueIdentifier>
+      <UniqueIdentifier>{818b86c5-01b4-47ef-9afd-d1ffb8eb3da3}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{06652d98-41dd-46c4-baa1-cc903e54629a}</UniqueIdentifier>
+      <UniqueIdentifier>{3a815d82-bd5d-4e9d-9ea5-852250d12ae5}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{af6508a9-84ad-4add-94d9-21fd6f336e55}</UniqueIdentifier>
+      <UniqueIdentifier>{b0fa26f1-e477-4178-b031-dc6dc7ba3313}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{8db407de-760d-4976-a744-8196dfcbcaea}</UniqueIdentifier>
+      <UniqueIdentifier>{68b2007b-058e-45c2-aed4-2ca0ecffb2b7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{9b3dce2a-959c-43e3-b3e4-1b847a747331}</UniqueIdentifier>
+      <UniqueIdentifier>{b2b20c1a-8c27-4024-8451-a5c88d1d813e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{bb67fa90-b7f9-456d-a4d7-0a19f6009c7a}</UniqueIdentifier>
+      <UniqueIdentifier>{5eb499ec-087e-42e3-9523-cf24733d0e42}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{621aafe3-aec4-43eb-8932-ed50c30ea3be}</UniqueIdentifier>
+      <UniqueIdentifier>{a96ac567-7892-413e-8316-3485bb8fe2a4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{3ef3bb03-7967-46dd-9eef-fec838fff4a6}</UniqueIdentifier>
+      <UniqueIdentifier>{beeabcec-14c4-4062-8fae-80a7e54a9055}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{f92f7cdc-8c5d-4fb3-8daa-14a6ae549537}</UniqueIdentifier>
+      <UniqueIdentifier>{4d512add-e077-40aa-b725-0ce7335f4dac}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{43c37b9f-8cd7-4cb0-83d1-980a1a8d7c9f}</UniqueIdentifier>
+      <UniqueIdentifier>{f7257204-5208-4ed5-90bb-8959355e440e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{6cfed0ac-c677-4d6f-a982-283a9744f02d}</UniqueIdentifier>
+      <UniqueIdentifier>{c6215804-53a2-45a2-b4e2-1516596ddc4a}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{a6aaf9ed-b8e7-45b4-9d84-e15263477f02}</UniqueIdentifier>
+      <UniqueIdentifier>{08ceb626-66ab-4467-b604-47c9969d8b6e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{491a15a7-d67b-4c89-ac1a-154289405389}</UniqueIdentifier>
+      <UniqueIdentifier>{f9d0c0dc-1116-41b7-baa7-009bd4a84ed9}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{afea5c77-e585-4ef0-b839-eaabfa8c3919}</UniqueIdentifier>
+      <UniqueIdentifier>{0cd3a276-5ada-4caa-b886-3af5375c61c6}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{55c4aa9d-c7b8-420a-a09d-8f34aef45f81}</UniqueIdentifier>
+      <UniqueIdentifier>{b3eb9dc5-687e-47c9-babf-3d17a0bb6235}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{356641cc-596d-4552-b9bf-1faf382d7e00}</UniqueIdentifier>
+      <UniqueIdentifier>{7836102f-d597-4d27-b5e3-2acda6e3bf69}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{2b563cda-4fe0-4260-996d-0fd22cfcfb76}</UniqueIdentifier>
+      <UniqueIdentifier>{290dd1f5-08eb-4d60-b494-201523788ba2}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{53be9b76-036e-419e-b3e7-2a9b017d0bcb}</UniqueIdentifier>
+      <UniqueIdentifier>{dcf73250-6923-4db2-bed4-adcc16c89d6c}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{8b7ff3ab-106e-4431-a063-2919b3775778}</UniqueIdentifier>
+      <UniqueIdentifier>{fc74081f-83ed-472e-a0a0-11867ef7bac1}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{ab1febaa-f7e7-4ecc-abe4-93338e87b355}</UniqueIdentifier>
+      <UniqueIdentifier>{adcfed60-5569-4920-8c1e-9add287b89ca}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{1454bebe-5a7c-42ea-9bc8-c06448fdee4f}</UniqueIdentifier>
+      <UniqueIdentifier>{8f840ded-3850-4916-b4ed-b6ec4e83950e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{7d61b9db-879a-4274-880b-6707453bb897}</UniqueIdentifier>
+      <UniqueIdentifier>{89489bb1-8dcd-40ca-9440-0f34108604ab}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{49bf6849-1875-4fa0-a5d3-4044ebf7884e}</UniqueIdentifier>
+      <UniqueIdentifier>{53d04817-3e91-431d-96e4-8dc5b21ad842}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{6d602252-1340-4918-94aa-0a3c2dd1e596}</UniqueIdentifier>
+      <UniqueIdentifier>{fd5b6f3a-9ebc-4132-ad37-d8141401f30c}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{50ab373f-6c49-4e0b-b57d-4d3ce52a8e13}</UniqueIdentifier>
+      <UniqueIdentifier>{96c2fee5-9a13-49a9-b1d8-ba836635a125}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{47d833d0-7479-47e9-94cb-1f9fde4edd8d}</UniqueIdentifier>
+      <UniqueIdentifier>{39df89f8-55bb-4af4-8fdc-ea77eec429b0}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{4670ae50-c4e4-4e06-8dc3-cb99f14d2074}</UniqueIdentifier>
+      <UniqueIdentifier>{91cdd6f3-13c2-4f4f-ba2e-cabadcb5fca9}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{f7390e8d-aabf-4bfb-be73-cac29c7ff5c1}</UniqueIdentifier>
+      <UniqueIdentifier>{a27e2ef3-b3e0-4c41-98ad-87470a0eb04b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{6c30da1c-a577-455e-99a1-42011efa76b3}</UniqueIdentifier>
+      <UniqueIdentifier>{d7f01da5-a2a4-4dff-9b7a-6a697a01ed0a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{94b31f8c-04dc-4ea5-8ba1-d575bc2e573d}</UniqueIdentifier>
+      <UniqueIdentifier>{259aed23-5ba0-42f1-950d-71bd3c39dcc7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{24f5af19-6172-44c6-9d9c-02599d66d843}</UniqueIdentifier>
+      <UniqueIdentifier>{1287a5e8-cf64-4d41-be99-ee9199398cb0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{8e003f9c-3642-4a8a-962c-a6f3f3e4dc52}</UniqueIdentifier>
+      <UniqueIdentifier>{3cc8c270-81bf-4692-ba03-79d683fb27c6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{6701b584-1ab5-4276-ba59-8ef83fc1d309}</UniqueIdentifier>
+      <UniqueIdentifier>{dc4fae2d-a656-404c-ae56-73ecb88c9299}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{1463526d-e823-48d5-9117-b0faff0f09db}</UniqueIdentifier>
+      <UniqueIdentifier>{49c2c3b8-3bc3-48d0-beb0-ca44e6f62401}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{68e14c18-8139-4405-a60b-de535e36f2d0}</UniqueIdentifier>
+      <UniqueIdentifier>{2fa43f34-9512-4471-8477-ebf1141b8070}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{1b9f3825-b404-4b53-ae06-22b3b1e9f8da}</UniqueIdentifier>
+      <UniqueIdentifier>{23b7f523-be20-4f78-a11e-c52f61747d65}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{acafb082-9417-4c01-ba1d-73e68a226829}</UniqueIdentifier>
+      <UniqueIdentifier>{4b2f6c0c-d485-4505-a9b1-d3c1ba9eb904}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{3affcf56-b390-4e5e-a16b-87dbfff249e1}</UniqueIdentifier>
+      <UniqueIdentifier>{158fa092-702c-4afb-8f04-88a87efcad83}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{918004f6-d54c-4e4c-980c-067041ff9a56}</UniqueIdentifier>
+      <UniqueIdentifier>{29664d10-9ef4-47dd-9fe6-5124dfb15fb8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{eb8e3ce2-7ab8-43e0-af4b-a8bbf5207a8f}</UniqueIdentifier>
+      <UniqueIdentifier>{3251696a-8639-421d-b880-1e67b9e93bb4}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{b2dd8308-42a3-499e-b659-2dc25bd6fd5d}</UniqueIdentifier>
+      <UniqueIdentifier>{dddcd45b-68bb-4977-9361-a72ab1ae6775}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{ace63e8e-c6bd-420b-8355-2051c77d114e}</UniqueIdentifier>
+      <UniqueIdentifier>{489526bd-ab83-4e2a-a0b0-c2430506962c}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{cfd0cf55-3048-411f-aa78-301b1fd8f52a}</UniqueIdentifier>
+      <UniqueIdentifier>{b767788d-d43d-41f9-9289-8418deef9ab2}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -153,6 +153,9 @@
     <ClInclude Include="src\NetCoreTestSuite.h">
       <Filter>NetCore\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\NetworkInterfaceTest.h">
+      <Filter>NetCore\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\SocketAddressTest.h">
       <Filter>NetCore\Header Files</Filter>
     </ClInclude>
@@ -306,9 +309,6 @@
     <ClInclude Include="src\WebSocketTestSuite.h">
       <Filter>WebSocket\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\NetworkInterfaceTest.h">
-      <Filter>NetCore\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\DNSTest.cpp">
@@ -320,6 +320,9 @@
     <ClCompile Include="src\NetCoreTestSuite.cpp">
       <Filter>NetCore\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\NetworkInterfaceTest.cpp">
+      <Filter>NetCore\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\SocketAddressTest.cpp">
       <Filter>NetCore\Source Files</Filter>
     </ClCompile>
@@ -476,8 +479,5 @@
     <ClCompile Include="src\WebSocketTestSuite.cpp">
       <Filter>WebSocket\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\NetworkInterfaceTest.cpp">
-      <Filter>NetCore\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Net/testsuite/TestSuite_x64_vs110.vcxproj b/Net/testsuite/TestSuite_x64_vs110.vcxproj
index 89728a9a2..93e88731b 100644
--- a/Net/testsuite/TestSuite_x64_vs110.vcxproj
+++ b/Net/testsuite/TestSuite_x64_vs110.vcxproj
@@ -121,7 +121,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -155,7 +155,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -183,7 +183,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -218,7 +218,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -247,7 +247,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -281,7 +281,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
diff --git a/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters
index 4bb2f92c0..889255bc5 100644
--- a/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters
+++ b/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters
@@ -2,145 +2,145 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{cabb3e5f-35b2-4b7b-8978-4bc87d742e35}</UniqueIdentifier>
+      <UniqueIdentifier>{23a2a4ae-ad01-4abd-8d71-8644c40ae070}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{31207d9b-ff67-497a-9404-1dd14a600f21}</UniqueIdentifier>
+      <UniqueIdentifier>{d6ea7d42-e678-42b6-9de8-aa0dbf52ff83}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{f4052496-540c-4102-8892-8d20adc8613e}</UniqueIdentifier>
+      <UniqueIdentifier>{8fa37fc6-3005-4764-9ed1-f6fd28165d95}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{b7c3ecb9-cd36-4ef1-89b1-b7e50d0653c9}</UniqueIdentifier>
+      <UniqueIdentifier>{1165cc8f-4b15-4674-93f0-66bc986242e9}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{486206de-cf83-423d-b294-6ef71d09ff25}</UniqueIdentifier>
+      <UniqueIdentifier>{30fc3581-9f90-4305-843f-911831efd6be}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{59b2ce5a-f723-47f5-888b-c37af55c9f33}</UniqueIdentifier>
+      <UniqueIdentifier>{908a1cfa-85ff-476b-bf90-423eb2677d3a}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{a80925e7-b1c4-40ad-968f-888e6b1be6f2}</UniqueIdentifier>
+      <UniqueIdentifier>{52c7fdc5-b63b-4268-b9bc-1a9133cbd59c}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{b2ed321b-bf48-4a21-b2a4-c268b4ce3dbe}</UniqueIdentifier>
+      <UniqueIdentifier>{7e494927-54ce-43d3-b624-3c5df937cbf4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{29dee929-206c-4b78-a729-3336c64cde35}</UniqueIdentifier>
+      <UniqueIdentifier>{9481bc98-983b-47ba-90f4-03572093bf22}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{fc1543ea-2482-4bb6-a0b2-179cdc0c18e3}</UniqueIdentifier>
+      <UniqueIdentifier>{a9f739ad-277e-477c-97ae-c0e252588535}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{8bba1364-450e-418f-81fd-b911c3a8a388}</UniqueIdentifier>
+      <UniqueIdentifier>{b7841045-225e-4d72-b200-23866a55527a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{e2dae831-6f4a-4f07-a75c-ac0dc97244c7}</UniqueIdentifier>
+      <UniqueIdentifier>{06a7ebbc-c86d-4056-a815-bd136cf4aef1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{c3666754-cfc4-4d91-8589-004dc07ac4e9}</UniqueIdentifier>
+      <UniqueIdentifier>{a085cf3c-1f4f-48e8-9765-22ce2f12b720}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{9b43b5e9-9ae4-4e92-948a-70dd153c7b4c}</UniqueIdentifier>
+      <UniqueIdentifier>{0f664b3c-6016-49b3-800c-4b1f22ade3fb}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{3120e4dd-9dfb-4cb7-9bde-1475798da4dd}</UniqueIdentifier>
+      <UniqueIdentifier>{551c7e4b-6059-42bc-8ea2-67bd1953e28f}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{fecb7a69-c62d-408a-9a51-127636b1ee08}</UniqueIdentifier>
+      <UniqueIdentifier>{ec755932-8891-496e-9d57-35162ce22ade}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{4e3f7815-5743-42d0-ac42-1c4eaf6b6c43}</UniqueIdentifier>
+      <UniqueIdentifier>{923c8fb8-66b8-4d0f-a77c-e0cec8da9715}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{21d93dac-29bc-4cff-9ddf-d88dc4b9603e}</UniqueIdentifier>
+      <UniqueIdentifier>{34720f76-15d3-4b01-ae40-824e52beeb27}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{930f3ec2-a977-401e-9cde-756fabc0a477}</UniqueIdentifier>
+      <UniqueIdentifier>{d54449f5-38f1-47d8-a7ca-870c5bbbdf67}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{1d8d51bc-6351-4f62-a070-8ea41d2978d2}</UniqueIdentifier>
+      <UniqueIdentifier>{54f37cbd-a055-47c1-b009-9b792ef3fdb5}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{56e0dc89-dc13-46c8-a3ec-49c1f772cb2e}</UniqueIdentifier>
+      <UniqueIdentifier>{d145ceaa-1838-44bb-aa13-dbd6cf713793}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{e2588d54-68f8-4c12-8fae-3322a5f504cd}</UniqueIdentifier>
+      <UniqueIdentifier>{e381c799-2397-45f6-b37b-178fa54bf066}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{abfabce2-2361-4911-8237-2739a888538e}</UniqueIdentifier>
+      <UniqueIdentifier>{fc391b58-4d53-4f9c-a72f-09b65e65714b}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{d8a73b7f-598c-4572-9e43-3e55bf951b8e}</UniqueIdentifier>
+      <UniqueIdentifier>{3f483c68-4a35-40b0-9ecc-01fbcbc1db47}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{937dd5cb-a2fb-498a-bc88-7fe284d72277}</UniqueIdentifier>
+      <UniqueIdentifier>{4cbe33d1-8add-4797-a5ec-ebc5749de001}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{831a70a7-614b-48d8-8e23-77d44bdbdf8f}</UniqueIdentifier>
+      <UniqueIdentifier>{ac1e7750-c15a-45d4-837e-5a6c0a5a0e35}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{75f6440a-f879-4a90-b492-960ddb578cb3}</UniqueIdentifier>
+      <UniqueIdentifier>{e9ec182f-a0ae-484a-adfe-bd1ffd37e39e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{794614d5-e2dd-4272-a6ea-8c424a1eb96a}</UniqueIdentifier>
+      <UniqueIdentifier>{81ae6e17-1ca9-4593-9ca0-c4e7bf01f2ca}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{6c515800-e48c-42b9-933f-0758a6c6367a}</UniqueIdentifier>
+      <UniqueIdentifier>{3e4e1329-fd77-44b9-9e45-5335ada9e658}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{7a0a59f3-0bfc-4805-949c-37b8fe2cc7f4}</UniqueIdentifier>
+      <UniqueIdentifier>{f4049832-e4d8-443c-8e25-0e6c29e6ec2c}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{19964805-2dbe-4c4f-80bf-2fba0f081071}</UniqueIdentifier>
+      <UniqueIdentifier>{f3d925b0-0b4a-4936-961b-ff6d558c373a}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{b6c5c254-2b60-4a25-b1eb-b5e7e2e77eb6}</UniqueIdentifier>
+      <UniqueIdentifier>{506ecd62-88e7-409f-b41b-58e9911c3c20}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{5062fc53-a881-4980-bbe4-51d2f6739808}</UniqueIdentifier>
+      <UniqueIdentifier>{1bb28940-e11e-4cc6-bc8a-9f542af2baa7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{9a4fd2dc-0ca5-4cba-91af-a8f5c761fc9c}</UniqueIdentifier>
+      <UniqueIdentifier>{351ec529-1f5d-426e-99aa-4b7234cace72}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{ec4dbaea-fda2-48b4-a8bc-e83a600e90b8}</UniqueIdentifier>
+      <UniqueIdentifier>{e7976657-9e19-4399-bfac-d5016e968cf9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{9c4add48-766d-4f7c-a987-76e3f5700027}</UniqueIdentifier>
+      <UniqueIdentifier>{01dfdb5a-dba6-4764-9dff-a8a249c31546}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{a843dd29-34c2-4d74-815a-5128a1c1a772}</UniqueIdentifier>
+      <UniqueIdentifier>{98bb496f-6ba3-4478-b408-4e2fdbe4dce8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{2336251a-aecc-46d8-a136-0e9045ef2101}</UniqueIdentifier>
+      <UniqueIdentifier>{be9d8006-d505-4f2c-af12-8247e8f04308}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{4bc79a9c-4162-42c2-bc7e-78854bcac58b}</UniqueIdentifier>
+      <UniqueIdentifier>{5b2bb5d4-5df4-4cfb-9504-7e6e1478562e}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{4bd75bfa-8327-43d4-9202-fdd50ed42965}</UniqueIdentifier>
+      <UniqueIdentifier>{43184c81-1fb4-4be5-9e27-e85a749af6ff}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{b6c2dd15-e6e2-4794-8f74-741eb8993820}</UniqueIdentifier>
+      <UniqueIdentifier>{d23c7ed5-994f-4aef-8e74-12a637d54a36}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{7a328e73-0efe-449d-aec2-b17d4570f9e5}</UniqueIdentifier>
+      <UniqueIdentifier>{98e4363a-c6cb-458b-aa9a-d0366b116939}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{2c6c30cc-f403-481e-a41c-4f9f7d7bd870}</UniqueIdentifier>
+      <UniqueIdentifier>{375c6c53-0448-484c-b057-cceb48c90a13}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{83d1fc02-4169-46b0-8e2b-2e5a64eee304}</UniqueIdentifier>
+      <UniqueIdentifier>{bc21d210-ea46-4b17-a398-c92259129283}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{8719e277-7201-4862-ad1f-5bd0a99d47f8}</UniqueIdentifier>
+      <UniqueIdentifier>{d6fdaf6a-a93a-4376-af61-3d8ef12d652d}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{f267fe59-e0bb-43f0-9951-427211f04892}</UniqueIdentifier>
+      <UniqueIdentifier>{b5071ed2-3e9e-4aa8-9a4e-7e2425f3561d}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{e98dad04-69e3-45b8-8cfd-9d2667463f78}</UniqueIdentifier>
+      <UniqueIdentifier>{6507c3e5-7c09-4495-ba99-18f558f0a9cd}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/Net/testsuite/TestSuite_x64_vs90.vcproj b/Net/testsuite/TestSuite_x64_vs90.vcproj
index e401396cd..4de6504e7 100644
--- a/Net/testsuite/TestSuite_x64_vs90.vcproj
+++ b/Net/testsuite/TestSuite_x64_vs90.vcproj
@@ -33,7 +33,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;"
 				StringPooling="true"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
@@ -171,7 +171,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="4"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
 				StringPooling="true"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -244,7 +244,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
@@ -311,7 +311,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="4"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
 				StringPooling="true"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -383,7 +383,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
@@ -441,6 +441,8 @@
 					RelativePath=".\src\IPAddressTest.h"/>
 				<File
 					RelativePath=".\src\NetCoreTestSuite.h"/>
+				<File
+					RelativePath=".\src\NetworkInterfaceTest.h"/>
 				<File
 					RelativePath=".\src\SocketAddressTest.h"/>
 			</Filter>
@@ -452,6 +454,8 @@
 					RelativePath=".\src\IPAddressTest.cpp"/>
 				<File
 					RelativePath=".\src\NetCoreTestSuite.cpp"/>
+				<File
+					RelativePath=".\src\NetworkInterfaceTest.cpp"/>
 				<File
 					RelativePath=".\src\SocketAddressTest.cpp"/>
 			</Filter>
@@ -493,8 +497,6 @@
 					RelativePath=".\src\MulticastEchoServer.h"/>
 				<File
 					RelativePath=".\src\MulticastSocketTest.h"/>
-				<File
-					RelativePath=".\src\NetworkInterfaceTest.h"/>
 				<File
 					RelativePath=".\src\RawSocketTest.h"/>
 				<File
@@ -520,8 +522,6 @@
 					RelativePath=".\src\MulticastEchoServer.cpp"/>
 				<File
 					RelativePath=".\src\MulticastSocketTest.cpp"/>
-				<File
-					RelativePath=".\src\NetworkInterfaceTest.cpp"/>
 				<File
 					RelativePath=".\src\RawSocketTest.cpp"/>
 				<File