diff --git a/NetSSL_Win/NetSSL_Win_CE_vs90.vcproj b/NetSSL_Win/NetSSL_Win_CE_vs90.vcproj
index 26c878f89..6ea57aae7 100644
--- a/NetSSL_Win/NetSSL_Win_CE_vs90.vcproj
+++ b/NetSSL_Win/NetSSL_Win_CE_vs90.vcproj
@@ -585,14 +585,12 @@
 		<File
 			RelativePath="..\DLLVersion.rc">
 			<FileConfiguration
-				Name="debug_shared|Digi JumpStart (ARMV4I)"
-				ExcludedFromBuild="true">
+				Name="debug_shared|Digi JumpStart (ARMV4I)">
 				<Tool
 					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="release_shared|Digi JumpStart (ARMV4I)"
-				ExcludedFromBuild="true">
+				Name="release_shared|Digi JumpStart (ARMV4I)">
 				<Tool
 					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
diff --git a/NetSSL_Win/NetSSL_Win_WEC2013_vs110.vcxproj.filters b/NetSSL_Win/NetSSL_Win_WEC2013_vs110.vcxproj.filters
index 49c3a52f6..3cd75ebdd 100644
--- a/NetSSL_Win/NetSSL_Win_WEC2013_vs110.vcxproj.filters
+++ b/NetSSL_Win/NetSSL_Win_WEC2013_vs110.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{5bfd201d-5353-474d-8b00-97728f05febb}</UniqueIdentifier>
+      <UniqueIdentifier>{8e9080a6-c482-46d1-b303-488ebf4aed6a}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{1559354c-7b2e-438d-a6df-07aaac04a84c}</UniqueIdentifier>
+      <UniqueIdentifier>{19944369-2463-44ee-b994-6dd352cb740b}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{b12c2695-5920-4be8-8663-9e1aea3199d9}</UniqueIdentifier>
+      <UniqueIdentifier>{d7ec2b46-0d4f-4b0b-ae3a-619f07ef368c}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{9a7fbf43-cca2-43c1-96fe-e1093e050d90}</UniqueIdentifier>
+      <UniqueIdentifier>{7e9e80c5-a150-4c09-b0d2-40fcc05c12ba}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{71b40199-b308-45e9-aa08-0749cd6c5a5e}</UniqueIdentifier>
+      <UniqueIdentifier>{0e2719e4-49d7-4159-b8a1-5d808a9dac29}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{48d13d4a-27ed-4698-b817-5549e555c179}</UniqueIdentifier>
+      <UniqueIdentifier>{ff301788-8c20-4fcf-9513-733fda852aa3}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{7839b50b-775c-4a76-be93-7bc684ddd8f8}</UniqueIdentifier>
+      <UniqueIdentifier>{a8d53bef-7ed3-4bc7-9413-a928e0702f69}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{1821926c-af37-463d-8285-ece2178b096e}</UniqueIdentifier>
+      <UniqueIdentifier>{f622fa05-8ee7-4131-aae6-4f2d62554d26}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{a57d153f-11ad-4fd3-9891-5a447b7219ba}</UniqueIdentifier>
+      <UniqueIdentifier>{b6cc1ff0-0945-4c6e-9bec-6985beebf101}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{b3150f4d-c9fc-4ad0-9772-f12f8396e3e6}</UniqueIdentifier>
+      <UniqueIdentifier>{fc7f3e1f-481d-4449-9257-0c155823003e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{2ecc175c-66cf-4ec6-8f27-2edc5422c9ee}</UniqueIdentifier>
+      <UniqueIdentifier>{fd970485-f84c-436f-bb47-b22c89f3f4a6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{b469b8b6-069c-46ab-8cd0-b24b574eee39}</UniqueIdentifier>
+      <UniqueIdentifier>{245806c6-dc1c-4265-98c3-a3f77b2e9461}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj.filters b/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj.filters
index f9a5af3ce..bfdc417fd 100644
--- a/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj.filters
+++ b/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{c97cce34-b77e-4b7f-8e9a-3019eb632fbd}</UniqueIdentifier>
+      <UniqueIdentifier>{0e2cdbb5-1a51-4952-aefd-66a1203d98fb}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{49119af2-76b3-4b16-97ba-a63cdac52bbe}</UniqueIdentifier>
+      <UniqueIdentifier>{a295af0b-e1c5-40b3-bde8-94c6bb1e6dfa}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{60e51f3a-3fca-4e35-9af3-f069239b0178}</UniqueIdentifier>
+      <UniqueIdentifier>{61a936e4-4e47-4715-be4a-ca479e5a4ff4}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{d025a2f1-a194-41a3-b1c2-92ba4b1e5d72}</UniqueIdentifier>
+      <UniqueIdentifier>{d82248b3-2f53-4068-8c31-9215ea53b505}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{ef1f645a-79a9-4460-b4cd-dc6c6c20914f}</UniqueIdentifier>
+      <UniqueIdentifier>{b5510542-669e-406c-a643-10258a044286}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{88bc4d2f-8841-40bd-96a2-f8221f117e6c}</UniqueIdentifier>
+      <UniqueIdentifier>{6d6cea4b-4e4e-4891-a928-454970fecc0e}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{39a02929-908a-4f1e-86f0-3276cffb6c40}</UniqueIdentifier>
+      <UniqueIdentifier>{f142e551-6cab-4f02-b949-a8b2403cc3fb}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{c19a92d6-e3a9-4923-8e8e-e944f5e42d5d}</UniqueIdentifier>
+      <UniqueIdentifier>{8008cad3-d11f-4712-ab6c-91749277066b}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{d1163d8a-5bed-4eb2-a420-077203af4fd7}</UniqueIdentifier>
+      <UniqueIdentifier>{708ece6b-9aff-44ee-b9d1-2d8b088eaaf1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{81b9703c-2cbe-4663-827b-ced252244e80}</UniqueIdentifier>
+      <UniqueIdentifier>{072d9812-8ab6-4518-ad4f-0c3d97a5d2bb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{18c4f177-e793-4482-8639-76cb668498a2}</UniqueIdentifier>
+      <UniqueIdentifier>{acb8644c-5a29-4ca5-89aa-4aad35912940}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{9f0c70f0-bca7-4627-9a59-5dde3ebc2bb3}</UniqueIdentifier>
+      <UniqueIdentifier>{349e6776-c18b-40a4-a35f-c29bac6734de}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/NetSSL_Win/NetSSL_Win_vs100.vcxproj b/NetSSL_Win/NetSSL_Win_vs100.vcxproj
index 60ad07837..8c72cf2b4 100644
--- a/NetSSL_Win/NetSSL_Win_vs100.vcxproj
+++ b/NetSSL_Win/NetSSL_Win_vs100.vcxproj
@@ -336,10 +336,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/NetSSL_Win/NetSSL_Win_vs100.vcxproj.filters b/NetSSL_Win/NetSSL_Win_vs100.vcxproj.filters
index 8461ed496..54c9cc097 100644
--- a/NetSSL_Win/NetSSL_Win_vs100.vcxproj.filters
+++ b/NetSSL_Win/NetSSL_Win_vs100.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{e84c9fb4-9d49-4acc-94b0-f4f7971ddd8d}</UniqueIdentifier>
+      <UniqueIdentifier>{ac11935c-41fa-4c11-9efb-e942ed16ee7e}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{ccc39d7d-e2a2-47f2-b6c9-21db80c4a448}</UniqueIdentifier>
+      <UniqueIdentifier>{ceabefe9-c169-400e-a4bc-81746bf81f17}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{479bafd8-2641-497b-9f07-96e77dd528e6}</UniqueIdentifier>
+      <UniqueIdentifier>{35746c97-2a4a-4558-ac06-00697ddd3132}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{2ab2fe60-3798-405b-a283-d6a0cfb03364}</UniqueIdentifier>
+      <UniqueIdentifier>{63832a63-ca12-4b48-862e-86aaefce04cc}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{f3ff96d5-b3fe-4e7e-a482-702bb433ba18}</UniqueIdentifier>
+      <UniqueIdentifier>{8ac8d3aa-d885-4225-a66a-e2210d1067f7}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{922f8783-bce2-4d60-9a29-3f66d06dbc08}</UniqueIdentifier>
+      <UniqueIdentifier>{2c56692c-c967-4386-86e2-59396c8f50e4}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{e3b1375b-0ed3-4355-9261-8180235fba80}</UniqueIdentifier>
+      <UniqueIdentifier>{b080b422-13ec-4752-ab73-808b6d68c0fe}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{d25c400d-24da-403d-a46e-35c4c7f09a97}</UniqueIdentifier>
+      <UniqueIdentifier>{9b2754b5-c5ca-4caa-ab47-bb09da492dd9}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{3d354e1d-acb6-4ba6-811c-bc8c60776a98}</UniqueIdentifier>
+      <UniqueIdentifier>{a89ded6c-fce2-4832-a8ea-93ca485d1619}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{bf078dca-d0d3-48e7-a3f6-3613879ff50b}</UniqueIdentifier>
+      <UniqueIdentifier>{6195e744-44b4-4280-ae3d-c8a7cff2d08e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{1b20f94c-5c3a-4b8d-80f3-64b8317c0dea}</UniqueIdentifier>
+      <UniqueIdentifier>{3302485e-9013-413f-a5bf-b57fef5b7048}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{f1d8ab7a-3b39-450f-85b2-4b92ca32e4a2}</UniqueIdentifier>
+      <UniqueIdentifier>{503b3439-96b5-4f2e-9639-0409e4c94461}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/NetSSL_Win/NetSSL_Win_vs110.vcxproj b/NetSSL_Win/NetSSL_Win_vs110.vcxproj
index 485272f9d..d4776fa46 100644
--- a/NetSSL_Win/NetSSL_Win_vs110.vcxproj
+++ b/NetSSL_Win/NetSSL_Win_vs110.vcxproj
@@ -340,10 +340,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/NetSSL_Win/NetSSL_Win_vs110.vcxproj.filters b/NetSSL_Win/NetSSL_Win_vs110.vcxproj.filters
index 48fd4506d..8b0b6584f 100644
--- a/NetSSL_Win/NetSSL_Win_vs110.vcxproj.filters
+++ b/NetSSL_Win/NetSSL_Win_vs110.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{712df55a-134d-445d-855c-bd32dc1f3eff}</UniqueIdentifier>
+      <UniqueIdentifier>{09f2d7f8-97f1-4f84-906b-96ed5144e66b}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{0bc4825b-9cbb-42d9-8c8b-7b91a423ad1d}</UniqueIdentifier>
+      <UniqueIdentifier>{2f69bc3b-544a-471e-9b10-774daa07a633}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{b6d847ff-2d77-467f-8f2e-30c73370dd4a}</UniqueIdentifier>
+      <UniqueIdentifier>{43b07ee6-fd56-400e-8ea4-d5d5a372b3a8}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{9203464f-cfd8-4329-aba4-94d3e1142fd6}</UniqueIdentifier>
+      <UniqueIdentifier>{670de76b-74e7-4cfc-ac84-c3a2df19d0c5}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{c9792d65-b550-4c5a-a419-2e0ca2a12bb9}</UniqueIdentifier>
+      <UniqueIdentifier>{be543345-7d11-4da2-beac-11b781d60ab4}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{97c5c835-7eab-4e3f-b048-38e358d06150}</UniqueIdentifier>
+      <UniqueIdentifier>{aafac8da-5d87-4ea2-bc2e-0eb826710698}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{0b7d2dca-16c1-40ce-951a-81fc56d5dd9b}</UniqueIdentifier>
+      <UniqueIdentifier>{8bc307b8-ed5e-433f-b0fe-cdc827a900f8}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{75694d41-6fe2-45ac-8ae9-a658d7da073f}</UniqueIdentifier>
+      <UniqueIdentifier>{766778b9-f588-495a-ac61-a43245f2c478}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{99a9b70c-2de6-4395-9b5c-a71fa7be3ee9}</UniqueIdentifier>
+      <UniqueIdentifier>{df3514dd-c021-4ed8-9d16-afb8792ebdc0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{92047195-990e-4beb-8a26-c77447b25319}</UniqueIdentifier>
+      <UniqueIdentifier>{21637d7e-ddd3-4560-b240-98984b575a75}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{96678df3-b3fa-4d0f-b595-0337b228d18c}</UniqueIdentifier>
+      <UniqueIdentifier>{8aff40db-3868-44bb-bbd2-1066ad2ade92}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{4bed5f12-b3ab-47bb-b906-f6fd879e4c19}</UniqueIdentifier>
+      <UniqueIdentifier>{f5173e2b-33c7-49b4-be80-1601f69ed1a0}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/NetSSL_Win/NetSSL_Win_vs120.vcxproj b/NetSSL_Win/NetSSL_Win_vs120.vcxproj
index db7825938..223ad5468 100644
--- a/NetSSL_Win/NetSSL_Win_vs120.vcxproj
+++ b/NetSSL_Win/NetSSL_Win_vs120.vcxproj
@@ -340,10 +340,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/NetSSL_Win/NetSSL_Win_vs120.vcxproj.filters b/NetSSL_Win/NetSSL_Win_vs120.vcxproj.filters
index 4419c090c..ba83d65d0 100644
--- a/NetSSL_Win/NetSSL_Win_vs120.vcxproj.filters
+++ b/NetSSL_Win/NetSSL_Win_vs120.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{0e08e434-4c90-4468-9d87-679c53782d4d}</UniqueIdentifier>
+      <UniqueIdentifier>{295fafc8-9a75-4cf7-9629-891b54aecef3}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{74230cf4-448b-4917-81ba-79c2abacb424}</UniqueIdentifier>
+      <UniqueIdentifier>{e14403b6-af8f-444d-9c0e-c33a6ac0a457}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{34768ce2-be6d-48e7-a10a-4aaaabbadc05}</UniqueIdentifier>
+      <UniqueIdentifier>{b331fe75-17ce-40aa-ab31-100b9f7a7070}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{499aa1bd-1b9f-4f82-af44-e3e0301717f9}</UniqueIdentifier>
+      <UniqueIdentifier>{32a1f5b7-04f3-4183-a55f-cfdc92d625cc}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{84ffa918-602c-4fb6-a539-978f4738bf12}</UniqueIdentifier>
+      <UniqueIdentifier>{afe95874-3e18-4691-b3cf-c3b0e9467351}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{f087f600-daee-4e67-b135-2422a6b18df4}</UniqueIdentifier>
+      <UniqueIdentifier>{e091cf90-7a82-490b-bc3e-79cfdae39cf5}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{3f5de85d-dee2-4337-8ccc-7c0b9bc3e9e2}</UniqueIdentifier>
+      <UniqueIdentifier>{798d915a-6ee9-4b5f-890c-6d9056dad19a}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{7453d4d8-88c6-4529-88ff-3cf3230066af}</UniqueIdentifier>
+      <UniqueIdentifier>{d5554590-8582-4b84-8294-fe97483e0158}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{df93ef7f-c528-4dca-a761-5114044c70c4}</UniqueIdentifier>
+      <UniqueIdentifier>{11ee09f6-bab9-4538-adbe-e230aa728f54}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{63eb6c22-f8e2-4a8f-846f-e88c3ff16e8d}</UniqueIdentifier>
+      <UniqueIdentifier>{4583b173-b82b-4ad4-a5f8-1548112e41e5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{31abc272-9dd7-497c-a759-f0912497f200}</UniqueIdentifier>
+      <UniqueIdentifier>{01d9e408-18f8-44f6-a435-4326fc822275}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{73b041e3-088e-4887-8bcb-fa9d126ffe9c}</UniqueIdentifier>
+      <UniqueIdentifier>{803d02aa-4aee-41b5-a614-587781eb9bef}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/NetSSL_Win/NetSSL_Win_vs140.vcxproj b/NetSSL_Win/NetSSL_Win_vs140.vcxproj
index 637d990b8..19404dde2 100644
--- a/NetSSL_Win/NetSSL_Win_vs140.vcxproj
+++ b/NetSSL_Win/NetSSL_Win_vs140.vcxproj
@@ -340,10 +340,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/NetSSL_Win/NetSSL_Win_vs140.vcxproj.filters b/NetSSL_Win/NetSSL_Win_vs140.vcxproj.filters
index 6405ca11f..94bce1f12 100644
--- a/NetSSL_Win/NetSSL_Win_vs140.vcxproj.filters
+++ b/NetSSL_Win/NetSSL_Win_vs140.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{1ab74779-1e8a-4032-af64-5171c5f28acd}</UniqueIdentifier>
+      <UniqueIdentifier>{e02862df-b892-47f7-bb4c-d0895a9bbaea}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{152360d9-3a5f-4c11-b4e6-114c270a11e5}</UniqueIdentifier>
+      <UniqueIdentifier>{0d488ee3-9e19-442c-8517-a69b61f8c6cf}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{6c01cd10-f0e9-4565-b37c-5ee19cd45a2b}</UniqueIdentifier>
+      <UniqueIdentifier>{e712b347-c836-4d78-b04e-138d28ee149e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{f0ee37b9-f8ec-4048-a5b6-f1919d1d74a9}</UniqueIdentifier>
+      <UniqueIdentifier>{5a4da8df-a955-47cc-8e0c-d2c36ab19a35}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{32d0f3c9-5af1-48f8-96cb-f9f3bbecd64b}</UniqueIdentifier>
+      <UniqueIdentifier>{1087b56c-cf24-4330-90b1-df1214d5fb32}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{e962fc26-1303-4e81-bf06-a52fcd1940cd}</UniqueIdentifier>
+      <UniqueIdentifier>{c16e108c-cfa0-41c8-9588-51456b31beeb}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{e7f69eb7-2eee-4d19-99e3-5fa7daad8dba}</UniqueIdentifier>
+      <UniqueIdentifier>{34efd48b-debe-48eb-b236-36fe7bbdb1bd}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{901d62ae-5604-48ba-b511-db2792b2158a}</UniqueIdentifier>
+      <UniqueIdentifier>{f9a61a90-37f2-4bd6-995f-f7cce4fe7d6b}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{3f30eff3-955c-45bc-9caf-9748f50f3177}</UniqueIdentifier>
+      <UniqueIdentifier>{8e897645-1a2c-4d22-839f-4f65acf66c1a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{60bd0cb8-e40d-4bc8-a884-5b49b99bc222}</UniqueIdentifier>
+      <UniqueIdentifier>{166665b6-50c7-4ae3-8276-6f21ea326674}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{f2c5857b-de35-4789-bc71-ac883a9ec9e9}</UniqueIdentifier>
+      <UniqueIdentifier>{bb921b5c-c26e-4e9e-98df-900832f95364}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{9b237ebe-2a71-4797-8968-38e02ec41cf5}</UniqueIdentifier>
+      <UniqueIdentifier>{d78b5272-9263-4813-b474-4f52a0bf3473}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/NetSSL_Win/NetSSL_Win_vs150.vcxproj b/NetSSL_Win/NetSSL_Win_vs150.vcxproj
index 4a6ca4571..b7261e7fb 100644
--- a/NetSSL_Win/NetSSL_Win_vs150.vcxproj
+++ b/NetSSL_Win/NetSSL_Win_vs150.vcxproj
@@ -340,10 +340,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/NetSSL_Win/NetSSL_Win_vs150.vcxproj.filters b/NetSSL_Win/NetSSL_Win_vs150.vcxproj.filters
index 3775e6e42..5d019aa9d 100644
--- a/NetSSL_Win/NetSSL_Win_vs150.vcxproj.filters
+++ b/NetSSL_Win/NetSSL_Win_vs150.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{9f447256-961d-41c3-8824-468a452da606}</UniqueIdentifier>
+      <UniqueIdentifier>{4553d8fb-4402-40ef-bbea-7103b8c0866e}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{38461770-587a-4f38-9a9c-fba0092efbc9}</UniqueIdentifier>
+      <UniqueIdentifier>{7e9f16d8-c337-46ac-ac37-1468602f8e7d}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{7dcdaf03-667c-4dee-aef9-f818556f82fd}</UniqueIdentifier>
+      <UniqueIdentifier>{d34af362-d92c-46f8-8cc6-035e53c459a7}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{76abd253-2dd3-4eb9-ad36-73991ba7d76f}</UniqueIdentifier>
+      <UniqueIdentifier>{b28009d3-781f-4655-bd0c-d17f13f3098c}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{d4a3c267-61c0-4514-b6cc-fc0b709ff788}</UniqueIdentifier>
+      <UniqueIdentifier>{1e70e0a6-d874-4dcc-81c0-1862905b61ab}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{0bd2fdc4-a724-4743-b215-76694621ce6e}</UniqueIdentifier>
+      <UniqueIdentifier>{f7a83682-587c-4894-9d68-2d91b2033bd6}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{f75914a1-fa68-48f2-92b5-af02c83eb705}</UniqueIdentifier>
+      <UniqueIdentifier>{1897e66d-ba34-4190-bde9-5674b9dd6c4f}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{6b1e5060-c105-417b-b37d-5d0cff9d18d9}</UniqueIdentifier>
+      <UniqueIdentifier>{d8c329ef-4883-4f38-91c6-20e3b3741b0f}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{58ac428a-73cf-408f-a70c-9abd2bf76dbb}</UniqueIdentifier>
+      <UniqueIdentifier>{f28e82a8-528c-479d-9a79-b425440da7aa}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{b89e5333-f5ba-425d-a76e-5f1de63b97e0}</UniqueIdentifier>
+      <UniqueIdentifier>{acb843bf-7d74-4ad6-a24d-bf6f07b9df5e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{e9931949-b76d-4edd-9fc9-ba7490c426c6}</UniqueIdentifier>
+      <UniqueIdentifier>{11cfd586-6c7f-404a-bc51-840f39b1b9af}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{63b8b81e-4158-40e1-90fe-4e0f0daf2ab9}</UniqueIdentifier>
+      <UniqueIdentifier>{ea6f2195-99e9-4e54-9a43-d7f15331cbeb}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/NetSSL_Win/NetSSL_Win_vs160.vcxproj b/NetSSL_Win/NetSSL_Win_vs160.vcxproj
index 4986ed59c..f5cd03c91 100644
--- a/NetSSL_Win/NetSSL_Win_vs160.vcxproj
+++ b/NetSSL_Win/NetSSL_Win_vs160.vcxproj
@@ -340,10 +340,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/NetSSL_Win/NetSSL_Win_vs160.vcxproj.filters b/NetSSL_Win/NetSSL_Win_vs160.vcxproj.filters
index 6f5d7f89f..f6e67d02e 100644
--- a/NetSSL_Win/NetSSL_Win_vs160.vcxproj.filters
+++ b/NetSSL_Win/NetSSL_Win_vs160.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{8e7a10b5-03c1-4bd9-a232-26934887b811}</UniqueIdentifier>
+      <UniqueIdentifier>{ad10b1f3-65f2-4556-b1b8-5a2aa01643ab}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{0e022329-6e0d-45b7-b549-f72bad3b0e99}</UniqueIdentifier>
+      <UniqueIdentifier>{7282124d-d068-4100-b4a5-1674708610b7}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{e994960f-b454-451b-9a96-2f1551054ec2}</UniqueIdentifier>
+      <UniqueIdentifier>{861ecb5c-65db-47f2-9c3a-d1330b72be9b}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{ffdcd4bb-6d42-4e1e-a9e2-6a3dc5156596}</UniqueIdentifier>
+      <UniqueIdentifier>{aa7ca5a8-ab30-4a59-acbd-eaf2a96fd8bc}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{c152f873-0b8a-407c-859c-e55e0ce46638}</UniqueIdentifier>
+      <UniqueIdentifier>{b1c7d62d-f28b-48dd-af87-0aad5b23b6f5}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{e27f08e2-32c1-4a44-b6dc-55c253494efa}</UniqueIdentifier>
+      <UniqueIdentifier>{85466e58-0c94-40cc-bd83-d1ce8065c912}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{c8bcae4d-db90-4fef-9202-f6c8bf46dd1b}</UniqueIdentifier>
+      <UniqueIdentifier>{fc225186-3312-426a-979e-12e0a9668411}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{7495e510-eacf-4e3b-a993-1a8169b0c42e}</UniqueIdentifier>
+      <UniqueIdentifier>{f989048f-de67-4c60-a12d-6cdb9c91c9a7}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{31da528a-db94-4347-ba43-fbaeabc01672}</UniqueIdentifier>
+      <UniqueIdentifier>{b296f711-2b5d-4221-9973-871540b9f5a0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{3f889d46-2d3c-4d08-aa39-45ff025415f5}</UniqueIdentifier>
+      <UniqueIdentifier>{91661a06-927a-4e78-82de-2e390363fa76}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{cc85a060-6258-49ec-8792-49bf24edbf1a}</UniqueIdentifier>
+      <UniqueIdentifier>{eb0f7f36-77eb-4ed6-8b05-9c19a5c9d829}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{3772a67c-6b26-4960-996c-b3602a5f1eec}</UniqueIdentifier>
+      <UniqueIdentifier>{4bdf205b-04d4-400c-bf1c-1d8a398fe065}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/NetSSL_Win/NetSSL_Win_vs90.vcproj b/NetSSL_Win/NetSSL_Win_vs90.vcproj
index 1fba6483b..df488f421 100644
--- a/NetSSL_Win/NetSSL_Win_vs90.vcproj
+++ b/NetSSL_Win/NetSSL_Win_vs90.vcproj
@@ -539,14 +539,12 @@
 		<File
 			RelativePath="..\DLLVersion.rc">
 			<FileConfiguration
-				Name="debug_shared|Win32"
-				ExcludedFromBuild="true">
+				Name="debug_shared|Win32">
 				<Tool
 					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="release_shared|Win32"
-				ExcludedFromBuild="true">
+				Name="release_shared|Win32">
 				<Tool
 					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
diff --git a/NetSSL_Win/NetSSL_Win_x64_vs100.vcxproj b/NetSSL_Win/NetSSL_Win_x64_vs100.vcxproj
index c34536e6a..8808259cb 100644
--- a/NetSSL_Win/NetSSL_Win_x64_vs100.vcxproj
+++ b/NetSSL_Win/NetSSL_Win_x64_vs100.vcxproj
@@ -334,10 +334,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/NetSSL_Win/NetSSL_Win_x64_vs100.vcxproj.filters b/NetSSL_Win/NetSSL_Win_x64_vs100.vcxproj.filters
index e7bf96174..76f80f144 100644
--- a/NetSSL_Win/NetSSL_Win_x64_vs100.vcxproj.filters
+++ b/NetSSL_Win/NetSSL_Win_x64_vs100.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{33844dbf-dbcc-4477-8217-186a36645401}</UniqueIdentifier>
+      <UniqueIdentifier>{ed8d0d8a-92d2-48c5-9def-7329512624c2}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{0911f8a9-5840-4a40-8cb8-fc55b150a8d8}</UniqueIdentifier>
+      <UniqueIdentifier>{22af103c-0192-4e38-8b3a-f26fd0a646e2}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{92c83a8b-3a4e-4e6d-a3ac-00653c886ebb}</UniqueIdentifier>
+      <UniqueIdentifier>{25ccc41c-3c56-4990-9919-eda2dc624be4}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{5a189e36-d43e-46fe-9b66-97d84b44d6c9}</UniqueIdentifier>
+      <UniqueIdentifier>{bb3a221a-d751-44db-9961-6a455448d0d8}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{fad790db-8e6b-434d-b507-b62bc9ff7422}</UniqueIdentifier>
+      <UniqueIdentifier>{a0e72b73-1cd6-4a6e-9b4b-e7cfb3766985}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{0ab27317-fe53-4cad-b9a4-13c641eb58a0}</UniqueIdentifier>
+      <UniqueIdentifier>{124ebde6-9568-4683-98aa-f9236d3927c8}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{94c73787-b2c1-4883-9863-e291b3f58212}</UniqueIdentifier>
+      <UniqueIdentifier>{6e5d586d-73af-4b5c-b80c-e40d119f1c6f}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{e2c1bcee-6455-4c8f-8d22-ea9334bded06}</UniqueIdentifier>
+      <UniqueIdentifier>{5c4cdfab-cdc8-4f34-834b-bca9b1085957}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{815cde81-4260-417c-901e-af5ef4027fda}</UniqueIdentifier>
+      <UniqueIdentifier>{570ec2a7-e23f-4e1d-a326-61f0190a5f4e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{faba7106-3284-41aa-86e8-2620d6f3be5d}</UniqueIdentifier>
+      <UniqueIdentifier>{3687b8a6-1c3e-4f4a-9674-2a6480af0844}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{fe4bce41-43fb-4d3c-93e8-1bb65f2fe9ca}</UniqueIdentifier>
+      <UniqueIdentifier>{1d2d8bf1-3420-4c5a-b0ed-71d5987b636f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{a2b59516-70b7-42c5-9285-9f056cfed575}</UniqueIdentifier>
+      <UniqueIdentifier>{931a1dee-b412-4397-8581-686d151f82c2}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj b/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj
index 853483c45..ed6c9bea4 100644
--- a/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj
+++ b/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj
@@ -338,10 +338,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj.filters b/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj.filters
index ff557e2b7..8a464c44e 100644
--- a/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj.filters
+++ b/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{b9137670-33e6-4346-af91-c02ca58c8fcb}</UniqueIdentifier>
+      <UniqueIdentifier>{e2823bcb-5c90-454e-ac88-8c73639d6fd9}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{a595c688-1269-4471-9ffb-24a1d9301de2}</UniqueIdentifier>
+      <UniqueIdentifier>{efb7065f-3674-40c6-b0c6-7c8fdaad96f7}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{71f04816-73a6-4db7-983b-592d9786aa46}</UniqueIdentifier>
+      <UniqueIdentifier>{2e010ec3-8e07-4455-800c-d75f149c391a}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{2bdf8379-7ebf-4e9a-873b-a6ca47dc9a2c}</UniqueIdentifier>
+      <UniqueIdentifier>{2ab7905f-64e1-40ec-9a94-e77a98ea179e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{48648480-0c30-4aa5-b6ea-fbc3c28735dc}</UniqueIdentifier>
+      <UniqueIdentifier>{7599c6c0-1e4d-4787-8921-043956c13305}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{8e1452a1-32b6-48f5-9a99-5938e8ed6acb}</UniqueIdentifier>
+      <UniqueIdentifier>{f10f4b84-4f3e-461e-a0f8-3fddb3e9dfed}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{85e6da34-b044-4e7c-a0ab-45160f98ca07}</UniqueIdentifier>
+      <UniqueIdentifier>{6eeac2a5-4dae-4dd5-9065-bd28a8c600cf}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{7a081b53-d4c1-4dd0-ba51-89c1741701af}</UniqueIdentifier>
+      <UniqueIdentifier>{d40ba29b-a75e-4f88-902f-1e4d3387532a}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{a303d036-5649-4c68-8e95-c397cd707503}</UniqueIdentifier>
+      <UniqueIdentifier>{de7b2476-e7e3-413e-8364-6a6761419dc4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{f5498dd5-a40f-4c04-9c8a-de092b6bcd1e}</UniqueIdentifier>
+      <UniqueIdentifier>{de7373e9-794e-453a-8cb0-743277a0edcc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{07fa22f3-09db-4dcf-bb33-579cba924735}</UniqueIdentifier>
+      <UniqueIdentifier>{afad0c6c-5d31-421b-8e0d-45f4d334c40d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{577988af-de7e-416e-89c3-4866a47ef102}</UniqueIdentifier>
+      <UniqueIdentifier>{f9c017ee-c1ea-4ff5-b82c-88551913cb70}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj b/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj
index c9b3bfc62..41ea2f5db 100644
--- a/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj
+++ b/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj
@@ -338,10 +338,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj.filters b/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj.filters
index 5e5da877e..c1bdc4f20 100644
--- a/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj.filters
+++ b/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{0cc70284-e4d4-4d91-9f6d-e43d5cef844f}</UniqueIdentifier>
+      <UniqueIdentifier>{ffb69b5a-49ad-444a-99de-d2e01b9bf8dc}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{97fe0880-66e3-46b7-b26a-caa22d581261}</UniqueIdentifier>
+      <UniqueIdentifier>{2addf8cf-b1fc-4457-b439-31b28c91b928}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{4ca3a488-18f7-4d9a-aa7a-7ae4770fc935}</UniqueIdentifier>
+      <UniqueIdentifier>{112da5ba-c1af-40d8-8466-7330b07d5eb8}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{8069c120-20be-42ba-be72-36c528f2ffae}</UniqueIdentifier>
+      <UniqueIdentifier>{e8259d33-bc3d-46a3-a99e-5f0c4afba34f}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{77da3389-80f6-411e-bf6d-6fde620465ee}</UniqueIdentifier>
+      <UniqueIdentifier>{50bf089d-2481-4389-9cda-713dee430e5c}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{3e849470-d193-43be-8dfd-3e1003644fc7}</UniqueIdentifier>
+      <UniqueIdentifier>{023aee4d-df0b-4fdb-8a08-732e51b5e798}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{2d41eb02-4003-4ebf-a467-4a2520469d62}</UniqueIdentifier>
+      <UniqueIdentifier>{525a8c0e-d870-40fb-901c-2d99aa2c9359}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{e37ae164-4a3e-4397-bd56-99b60a845f32}</UniqueIdentifier>
+      <UniqueIdentifier>{56639422-1255-4b3c-94c6-0f1bfbbd3f48}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{69a48d0a-7ae6-463e-8d68-e705e7719636}</UniqueIdentifier>
+      <UniqueIdentifier>{59570f14-c875-4a5d-ba25-a52d57d8fe9f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{acc2a309-4c1f-467e-8158-92987512da75}</UniqueIdentifier>
+      <UniqueIdentifier>{ef7c8191-225e-4ae0-908e-0183f0d4e598}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{a818ed7b-793d-4618-aef0-93ee4e4d9609}</UniqueIdentifier>
+      <UniqueIdentifier>{e2103ee9-6f58-4e1d-987a-7ca174c643d8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{c479d318-7e0a-4d92-bb2b-6f6f51f46219}</UniqueIdentifier>
+      <UniqueIdentifier>{9c554180-bd5b-47c8-a6f2-6367052b9fbf}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj b/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj
index 44cfcb209..6b9fc4933 100644
--- a/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj
+++ b/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj
@@ -338,10 +338,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj.filters b/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj.filters
index 116f806bf..c30fded15 100644
--- a/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj.filters
+++ b/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{04eceefb-b4b4-4eac-89cb-f03ac3462a51}</UniqueIdentifier>
+      <UniqueIdentifier>{0754e2c8-d486-4d6c-bc72-50cc7feaee4b}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{3be42fd3-7c68-443e-933b-8652fe6e6929}</UniqueIdentifier>
+      <UniqueIdentifier>{a8943419-7b32-4a6d-aafe-adddc5a912bc}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{b78fa7cf-0c33-4c5b-ae2b-5eb03983ee5a}</UniqueIdentifier>
+      <UniqueIdentifier>{c8be2932-3e21-459a-8de6-6fa94dcc9e8a}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{da4fa1de-2650-4426-916e-c4e4d0e01082}</UniqueIdentifier>
+      <UniqueIdentifier>{70534021-67b5-42f3-b143-15bad69c5289}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{be0a29d9-f325-4808-8cd3-2c4a8864b009}</UniqueIdentifier>
+      <UniqueIdentifier>{02bc8996-4169-4631-97ed-6d7df0f1b3ba}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{fc4a1db2-4bc4-4ac6-89ab-a332348594d0}</UniqueIdentifier>
+      <UniqueIdentifier>{3f77f1ed-57da-4659-a9b4-b3cf50feea3b}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{46b55257-c190-44fb-ae04-58aa487e4779}</UniqueIdentifier>
+      <UniqueIdentifier>{59d9ed49-8446-4b52-a8bd-2313f48d8f22}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{dc353ea4-7e96-4dba-a932-2fb6183b5c83}</UniqueIdentifier>
+      <UniqueIdentifier>{e7f8833f-d704-4b89-b7ab-df0010dc4938}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{a178c7fe-b822-4d7e-bb0c-5e078863f047}</UniqueIdentifier>
+      <UniqueIdentifier>{f97729f7-6957-488f-a11a-86c39718df69}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{63f72cf3-7dbb-4c60-ba9c-4eee4b6cad3d}</UniqueIdentifier>
+      <UniqueIdentifier>{0c7ad8d8-7d8b-4c4d-8d3e-926647c8a927}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{957fef2a-b6a4-429e-b773-0aaf3a5b6d1b}</UniqueIdentifier>
+      <UniqueIdentifier>{5d56e0ac-1f59-47f1-b918-bfa8de7ce1d7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{fcddc952-78dd-42f8-87ca-7ffdfcbf2d97}</UniqueIdentifier>
+      <UniqueIdentifier>{d2be3926-91bc-4d71-a94e-4576b128af4f}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj b/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj
index 181ff8552..c703b4b2c 100644
--- a/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj
+++ b/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj
@@ -338,10 +338,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj.filters b/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj.filters
index b4fb7edce..d16b8e64a 100644
--- a/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj.filters
+++ b/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{7868a867-9e60-4e5c-a65c-4feb4476d111}</UniqueIdentifier>
+      <UniqueIdentifier>{f7c6913b-1709-4df4-bb70-33043f8fad39}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{0a8e9df4-7057-4047-8327-726d5fb236d6}</UniqueIdentifier>
+      <UniqueIdentifier>{171920fb-4a4b-4df3-8f25-5b7ef53a39b9}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{71544b92-b0bf-4a23-bfe4-980a9b89ca10}</UniqueIdentifier>
+      <UniqueIdentifier>{37b57be7-d504-4320-b187-390b93ad5660}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{e7fe3125-eab0-4b74-898c-d550e8b227ad}</UniqueIdentifier>
+      <UniqueIdentifier>{25053b31-b9d3-4788-b1fe-2fb46306a020}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{f5da4314-0d71-4e3e-a86a-c6e1f45647d5}</UniqueIdentifier>
+      <UniqueIdentifier>{fa87d18b-3a50-4833-9192-5664877ad833}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{1a495a35-1cdb-4d9e-8a9d-d4ed350e6065}</UniqueIdentifier>
+      <UniqueIdentifier>{095c4c7e-1218-446c-94c1-f3ddf4182135}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{706bd74c-73c4-4be9-a421-4bb0449d3a87}</UniqueIdentifier>
+      <UniqueIdentifier>{1dd66788-3528-4f1b-be5d-d06988dd5b79}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{656baae2-8d27-4de3-aab5-a590d25796a3}</UniqueIdentifier>
+      <UniqueIdentifier>{73e2aa79-8092-455b-8a3f-92cd85e9fa89}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{d9a594e7-5a9b-4251-b2e3-2fd2d9f412d5}</UniqueIdentifier>
+      <UniqueIdentifier>{b7eb3ae7-de10-4158-bfb8-411d8afa2e97}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{28d3b2c6-31d3-432d-a36e-1029ce781817}</UniqueIdentifier>
+      <UniqueIdentifier>{1aa77be9-8caa-411e-b7ed-8fc716b866d6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{cce70fee-7b7c-4336-b465-b5716d900604}</UniqueIdentifier>
+      <UniqueIdentifier>{49b241be-e1cf-4240-8c61-24ff4f15eb58}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{f60fc3c1-1e04-4ef3-8577-c9672080bd6c}</UniqueIdentifier>
+      <UniqueIdentifier>{20d7b777-539f-4f08-8c6f-756e9b10a83d}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/NetSSL_Win/NetSSL_Win_x64_vs160.vcxproj b/NetSSL_Win/NetSSL_Win_x64_vs160.vcxproj
index 256bb680e..cc0afdeb1 100644
--- a/NetSSL_Win/NetSSL_Win_x64_vs160.vcxproj
+++ b/NetSSL_Win/NetSSL_Win_x64_vs160.vcxproj
@@ -338,10 +338,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/NetSSL_Win/NetSSL_Win_x64_vs160.vcxproj.filters b/NetSSL_Win/NetSSL_Win_x64_vs160.vcxproj.filters
index 9e822a061..8092c72d1 100644
--- a/NetSSL_Win/NetSSL_Win_x64_vs160.vcxproj.filters
+++ b/NetSSL_Win/NetSSL_Win_x64_vs160.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{91e70860-ce00-4b00-954a-51a0f37ddc3c}</UniqueIdentifier>
+      <UniqueIdentifier>{8d47e149-45ad-4d36-9298-e0719b0b445d}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{8fb49cbb-a65f-4898-bb72-502b77b08056}</UniqueIdentifier>
+      <UniqueIdentifier>{0fab827d-7f93-45a2-8c13-81612352d16a}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{01dae0e6-a855-44b3-afce-cd39aec1b7a1}</UniqueIdentifier>
+      <UniqueIdentifier>{e6f73545-4359-4d9f-bb52-27087128375d}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{76c1d868-40c6-4310-a1dc-06b057aa1060}</UniqueIdentifier>
+      <UniqueIdentifier>{5c344af5-0931-433c-93ee-04f1703ee704}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{3fb8d026-7ede-4e5d-a2b1-d81abf14cbb9}</UniqueIdentifier>
+      <UniqueIdentifier>{6ded00cc-8457-4f64-ac34-6be85f1a49fa}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{e56f9d71-4fc1-46ea-a660-731596cb0382}</UniqueIdentifier>
+      <UniqueIdentifier>{9176e4b3-dc24-4490-aca4-d496f3b58c81}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{ccdca3f9-9e47-4b67-9e32-467ccdd75850}</UniqueIdentifier>
+      <UniqueIdentifier>{a3c51aa3-901e-43ba-8e65-bfd034695514}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{ee0f220d-afdb-47a3-9587-8985d5ae6d4b}</UniqueIdentifier>
+      <UniqueIdentifier>{403e0ff6-6af4-48be-b002-4ee3681e4f96}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{300158da-65f2-484b-9d55-993d2a849719}</UniqueIdentifier>
+      <UniqueIdentifier>{36d066de-1d93-4dcf-8e34-fc680b09fb27}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{b3371a9e-3771-4af7-9b89-f840ecd7d9b0}</UniqueIdentifier>
+      <UniqueIdentifier>{bee5848c-0188-4b98-a7ef-afccd65bd522}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{4e52b4d7-fa63-49fc-88d7-31e82a867c92}</UniqueIdentifier>
+      <UniqueIdentifier>{9007047e-32ac-49aa-af08-d100b9d85852}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{336431cb-870f-4394-8dcf-37c74a6f4741}</UniqueIdentifier>
+      <UniqueIdentifier>{fd3ad638-2880-4740-8623-5d69ed6a9fde}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/NetSSL_Win/NetSSL_Win_x64_vs90.vcproj b/NetSSL_Win/NetSSL_Win_x64_vs90.vcproj
index 07aca34b3..05ef42033 100644
--- a/NetSSL_Win/NetSSL_Win_x64_vs90.vcproj
+++ b/NetSSL_Win/NetSSL_Win_x64_vs90.vcproj
@@ -544,14 +544,12 @@
 		<File
 			RelativePath="..\DLLVersion.rc">
 			<FileConfiguration
-				Name="debug_shared|x64"
-				ExcludedFromBuild="true">
+				Name="debug_shared|x64">
 				<Tool
 					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="release_shared|x64"
-				ExcludedFromBuild="true">
+				Name="release_shared|x64">
 				<Tool
 					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>